diff --git a/detector_control/DetectorWrapper.cpp b/detector_control/DetectorWrapper.cpp
index 264d29f8..c2f4af06 100644
--- a/detector_control/DetectorWrapper.cpp
+++ b/detector_control/DetectorWrapper.cpp
@@ -139,7 +139,7 @@ void DetectorWrapper::InternalStop() {
     auto state = GetState();
     if (state == DetectorState::ERROR)
         throw JFJochException(JFJochExceptionCategory::Detector, "Detector in error state");
-    else if (state == DetectorState::BUSY) {
+    else if ((state == DetectorState::BUSY) || (state == DetectorState::WAITING)) {
         try {
             det.stopDetector();
         } catch (...) {