diff --git a/tools/esp8266/app.cpp b/tools/esp8266/app.cpp
index dabcd4d3..f037a35f 100644
--- a/tools/esp8266/app.cpp
+++ b/tools/esp8266/app.cpp
@@ -236,8 +236,8 @@ void app::loop(void) {
             }
 
             mSys->BufCtrl.popBack();
-            yield();
         }
+        yield();
 
 
         if(rxRdy) {
@@ -321,7 +321,7 @@ void app::loop(void) {
                         mRxFailed++;
                         if(mSerialDebug) {
                             DPRINT(F("Inverter #") + String(iv->id) + " ");
-                            DPRINTLN(F("no Payload received!"));
+                            DPRINTLN(F("no Payload received! (retransmits: ") + String(mPayload[iv->id].retransmits) + ")");
                         }
                     }
 
@@ -412,7 +412,7 @@ void app::processPayload(bool retransmit) {
                                     else
                                         mSys->Radio.sendTimePacket(iv->radioId.u64, mPayload[iv->id].ts);
                                 }
-                                mSys->Radio.switchRxCh(300);
+                                mSys->Radio.switchRxCh(100);
                             }
                         }
                     }
diff --git a/tools/esp8266/defines.h b/tools/esp8266/defines.h
index 7e312e9a..df9a055c 100644
--- a/tools/esp8266/defines.h
+++ b/tools/esp8266/defines.h
@@ -16,7 +16,7 @@
 //-------------------------------------
 #define VERSION_MAJOR       0
 #define VERSION_MINOR       4
-#define VERSION_PATCH       16
+#define VERSION_PATCH       17
 
 
 //-------------------------------------
diff --git a/tools/esp8266/hmRadio.h b/tools/esp8266/hmRadio.h
index 65ad52bf..8e9a2bea 100644
--- a/tools/esp8266/hmRadio.h
+++ b/tools/esp8266/hmRadio.h
@@ -14,7 +14,7 @@
 #define DUMMY_RADIO_ID          ((uint64_t)0xDEADBEEF01ULL)
 
 #define RX_CHANNELS             5
-#define RX_LOOP_CNT             600
+#define RX_LOOP_CNT             300
 
 
 const char* const rf24AmpPower[] = {"MIN", "LOW", "HIGH", "MAX"};