diff --git a/wled00/fcn_declare.h b/wled00/fcn_declare.h
index e883c5fbd..2e965a9af 100644
--- a/wled00/fcn_declare.h
+++ b/wled00/fcn_declare.h
@@ -230,8 +230,8 @@ void deletePreset(byte index);
 bool getPresetName(byte index, String& name);
 
 //remote.cpp
-void handleRemote(uint8_t *data, size_t len);
-void processESPNowButton();
+void handleWiZdata(uint8_t *incomingData, size_t len);
+void handleRemote();
 
 //set.cpp
 bool isAsterisksOnly(const char* str, byte maxLen);
diff --git a/wled00/remote.cpp b/wled00/remote.cpp
index de386932a..8787369c0 100644
--- a/wled00/remote.cpp
+++ b/wled00/remote.cpp
@@ -1,7 +1,7 @@
 #include "wled.h"
 #ifndef WLED_DISABLE_ESPNOW
 
-#define ESPNOW_BUSWAIT_TIMEOUT 30 // timeout in ms to wait for bus to finish updating
+#define ESPNOW_BUSWAIT_TIMEOUT 24 // one frame timeout to wait for bus to finish updating
 
 #define NIGHT_MODE_DEACTIVATED     -1
 #define NIGHT_MODE_BRIGHTNESS      5
@@ -182,7 +182,7 @@ static bool remoteJson(int button)
 }
 
 // Callback function that will be executed when data is received
-void handleRemote(uint8_t *incomingData, size_t len) {
+void handleWiZdata(uint8_t *incomingData, size_t len) {
   message_structure_t *incoming = reinterpret_cast<message_structure_t *>(incomingData);
 
   if (strcmp(last_signal_src, linked_remote) != 0) {
@@ -212,7 +212,8 @@ void handleRemote(uint8_t *incomingData, size_t len) {
   last_seq = cur_seq;
 }
 
-void processESPNowButton() {
+// process ESPNow button data (acesses FS, should not be called while update to avoid glitches)
+void handleRemote() {
   if(ESPNowButton > 0) {
   if (!remoteJson(ESPNowButton))
     switch (ESPNowButton) {
@@ -236,5 +237,5 @@ void processESPNowButton() {
 }
 
 #else
-void handleRemote(uint8_t *incomingData, size_t len) {}
+void handleRemote() {}
 #endif
diff --git a/wled00/udp.cpp b/wled00/udp.cpp
index 60774d701..5173842a6 100644
--- a/wled00/udp.cpp
+++ b/wled00/udp.cpp
@@ -979,7 +979,7 @@ void espNowReceiveCB(uint8_t* address, uint8_t* data, uint8_t len, signed int rs
 
   // handle WiZ Mote data
   if (data[0] == 0x91 || data[0] == 0x81 || data[0] == 0x80) {
-    handleRemote(data, len);
+    handleWiZdata(data, len);
     return;
   }
 
diff --git a/wled00/wled.cpp b/wled00/wled.cpp
index 229d363b3..b7f4ad7d6 100644
--- a/wled00/wled.cpp
+++ b/wled00/wled.cpp
@@ -85,7 +85,7 @@ void WLED::loop()
   handleIR();
   #endif
   #ifndef WLED_DISABLE_ESPNOW
-  processESPNowButton();
+  handleRemote();
   #endif
   #ifndef WLED_DISABLE_ALEXA
   handleAlexa();