diff --git a/Tools/sitl_run.sh b/Tools/sitl_run.sh
index 560838701c..65b5943c92 100755
--- a/Tools/sitl_run.sh
+++ b/Tools/sitl_run.sh
@@ -28,6 +28,14 @@ else
 	no_pxh=""
 fi
 
+if [ "$model" != none ]; then
+	jmavsim_pid=`ps aux | grep java | grep "\-jar jmavsim_run.jar" | awk '{ print $2 }'`
+	if [ -n "$jmavsim_pid" ]
+	then
+		kill $jmavsim_pid
+	fi
+fi
+
 if [ "$model" == "" ] || [ "$model" == "none" ]
 then
 	echo "empty model, setting iris as default"
@@ -47,12 +55,6 @@ pkill -x gazebo || true
 pkill -x px4 || true
 pkill -x px4_$model || true
 
-jmavsim_pid=`ps aux | grep java | grep "\-jar jmavsim_run.jar" | awk '{ print $2 }'`
-if [ -n "$jmavsim_pid" ]
-then
-	kill $jmavsim_pid
-fi
-
 cp $src_path/Tools/posix_lldbinit $rootfs/.lldbinit
 cp $src_path/Tools/posix.gdbinit $rootfs/.gdbinit