diff --git a/Arduino/BTCDieselHeater/BTCDieselHeater.ino b/Arduino/BTCDieselHeater/BTCDieselHeater.ino
index ff6e9fe..4a278ea 100644
--- a/Arduino/BTCDieselHeater/BTCDieselHeater.ino
+++ b/Arduino/BTCDieselHeater/BTCDieselHeater.ino
@@ -422,11 +422,11 @@ void loop()
       // Detect the possible start of a new frame sequence from an OEM controller
       // This will be the first activity for considerable period on the blue wire
       // The heater always responds to a controller frame, but otherwise never by itself
-      bHasHtrData = false;
       if(RxTimeElapsed >= 970) {
         // have not seen any receive data for a second.
         // OEM controller is probably not connected. 
         // Skip state machine immediately to BTC_Tx, sending our own settings.
+        bHasHtrData = false;
         bHasOEMController = false;
         bool isBTCmaster = true;
         TxManage.PrepareFrame(DefaultBTCParams, isBTCmaster);  // use our parameters, and mix in NV storage values
@@ -444,6 +444,7 @@ void loop()
           DebugPort.println("ms Idle time.");
         }
 
+        bHasHtrData = false;
         bHasOEMController = true;
         CommState.set(CommStates::OEMCtrlRx);   // we must add this new byte!
         //
@@ -954,4 +955,4 @@ const char* getBlueWireStatStr()
 bool hasOEMcontroller()
 {
   return bHasOEMController;
-}
\ No newline at end of file
+}