diff --git a/Tools/jMAVSim b/Tools/jMAVSim
index def7501bc0..3bd51e67e0 160000
--- a/Tools/jMAVSim
+++ b/Tools/jMAVSim
@@ -1 +1 @@
-Subproject commit def7501bc0536b8d1050f65d09c7dfbebcc0ce61
+Subproject commit 3bd51e67e022ce59644d33ebdf6570c2ea88ddb6
diff --git a/Tools/jmavsim_run.sh b/Tools/jmavsim_run.sh
index a974edee27..b04912afdd 100755
--- a/Tools/jmavsim_run.sh
+++ b/Tools/jmavsim_run.sh
@@ -49,6 +49,10 @@ else
 	device="-serial $device $baudrate"
 fi
 
+if [ "$HEADLESS" = "1" ]; then
+    extra_args="$extr_args -no-gui"
+fi
+
 # jMAVSim crashes with Java 9 on macOS, therefore we need to use Java 8
 if [ "$(uname)" == "Darwin" ]; then
     bold=$(tput bold)