diff --git a/src/modules/simulator/simulator.cpp b/src/modules/simulator/simulator.cpp
index e4d5197b361..3bc26e8017d 100644
--- a/src/modules/simulator/simulator.cpp
+++ b/src/modules/simulator/simulator.cpp
@@ -198,7 +198,7 @@ extern "C" {
 								argv);
 
 				// now wait for the command to complete
-				while (true) {
+				while (!px4_exit_requested()) {
 					if (Simulator::getInstance() && Simulator::getInstance()->isInitialized()) {
 						break;