diff --git a/src/main/io/serial_msp.c b/src/main/io/serial_msp.c
index d44dc8e9aa..72a47a163d 100644
--- a/src/main/io/serial_msp.c
+++ b/src/main/io/serial_msp.c
@@ -1861,6 +1861,10 @@ void mspProcess(void)
             waitForSerialPortToFinishTransmitting(candidatePort->port);
             stopMotors();
             handleOneshotFeatureChangeOnRestart();
+            // On real flight controllers, systemReset() will do a soft reset of the device,
+            // reloading the program.  But to support offline testing this flag needs to be
+            // cleared so that the software doesn't continuously attempt to reboot itself.
+            isRebootScheduled = false;
             systemReset();
         }
     }
diff --git a/src/main/sensors/initialisation.c b/src/main/sensors/initialisation.c
index 85b5ebb307..7e05f9688a 100755
--- a/src/main/sensors/initialisation.c
+++ b/src/main/sensors/initialisation.c
@@ -240,6 +240,7 @@ bool fakeGyroDetect(gyro_t *gyro)
     gyro->init = fakeGyroInit;
     gyro->read = fakeGyroRead;
     gyro->temperature = fakeGyroReadTemp;
+    gyro->scale = 1.0f / 16.4f;
     return true;
 }
 #endif