diff --git a/script/templates/EnergyScan.py b/script/templates/EnergyScan.py
index 30531f4..4b95609 100644
--- a/script/templates/EnergyScan.py
+++ b/script/templates/EnergyScan.py
@@ -77,7 +77,9 @@ newest = getNewestFile()
 
 #Pre-actions
 if NO_BEAM_CHECK == False:
-    wait_beam()
+    if not has_beam()
+        print "Maintenence mode: end of scan"
+        return
 
 
 if MODE is not None: