diff --git a/src/modules/stage/stage.cpp b/src/modules/stage/stage.cpp
index 8118aea..555db65 100644
--- a/src/modules/stage/stage.cpp
+++ b/src/modules/stage/stage.cpp
@@ -281,7 +281,14 @@ void is_stage_moving(String command)
 
 void activate_notify_on_stop(String command)
 {
-    notify_on_stop = true;
+    if (!stage_moving)
+    {
+        Serial.println("Error: stage is not moving");
+    }
+    else
+    {
+        notify_on_stop = true;
+    }
 }
 
 //TODO: move help strings to program memory