Index: trunk/FACT++/src/ratecontrol.cc
===================================================================
--- trunk/FACT++/src/ratecontrol.cc	(revision 16564)
+++ trunk/FACT++/src/ratecontrol.cc	(revision 16565)
@@ -317,4 +317,6 @@
             Info(out);
 
+            fTriggerOn = false;
+            fPhysTriggerEnabled = false;
             return RateControl::State::kGlobalThresholdSet;
         }
@@ -336,4 +338,6 @@
             Info(out);
 
+            fTriggerOn = false;
+            fPhysTriggerEnabled = false;
             return RateControl::State::kGlobalThresholdSet;
         }
@@ -529,4 +533,6 @@
         Info(out);
 
+        fTriggerOn = false;
+        fPhysTriggerEnabled = false;
         return RateControl::State::kGlobalThresholdSet;
     }
@@ -537,4 +543,7 @@
         {
             Info("Physics trigger not enabled... CALIBRATE command ignored.");
+
+            fTriggerOn = false;
+            fPhysTriggerEnabled = false;
             return RateControl::State::kGlobalThresholdSet;
         }
@@ -565,4 +574,7 @@
         {
             Info("Physics trigger not enabled... CALIBRATE command ignored.");
+
+            fTriggerOn = false;
+            fPhysTriggerEnabled = false;
             return RateControl::State::kGlobalThresholdSet;
         }
@@ -606,4 +618,6 @@
         case 0:
             Info("No calibration requested.");
+            fTriggerOn = false;
+            fPhysTriggerEnabled = false;
             return RateControl::State::kGlobalThresholdSet;
             break;