diff --git a/tasmota/xdrv_23_zigbee_8_parsers.ino b/tasmota/xdrv_23_zigbee_8_parsers.ino
index d97aa8335..172c85181 100644
--- a/tasmota/xdrv_23_zigbee_8_parsers.ino
+++ b/tasmota/xdrv_23_zigbee_8_parsers.ino
@@ -1059,6 +1059,7 @@ int32_t Z_Mgmt_Lqi_Bind_Rsp(int32_t res, const class SBuffer &buf, boolean lqi)
 
   // device is reachable
   zigbee_devices.deviceWasReached(shortaddr);
+  bool non_empty = false;     // check whether the response contains relevant information
 
   const char * friendlyName = zigbee_devices.getFriendlyName(shortaddr);
 
@@ -1089,6 +1090,7 @@ int32_t Z_Mgmt_Lqi_Bind_Rsp(int32_t res, const class SBuffer &buf, boolean lqi)
       uint8_t     m_lqi       = buf.get8(idx + 21);
       idx += 22;
 
+      non_empty = true;
       if (i > 0) {
         ResponseAppend_P(PSTR(","));
       }
@@ -1161,6 +1163,7 @@ int32_t Z_Mgmt_Lqi_Bind_Rsp(int32_t res, const class SBuffer &buf, boolean lqi)
         break;                                      // abort for any other value since we don't know the length of the field
       }
 
+      non_empty = true;
       if (i > 0) {
         ResponseAppend_P(PSTR(","));
       }
@@ -1180,7 +1183,8 @@ int32_t Z_Mgmt_Lqi_Bind_Rsp(int32_t res, const class SBuffer &buf, boolean lqi)
   MqttPublishPrefixTopicRulesProcess_P(RESULT_OR_TELE, PSTR(D_JSON_ZIGBEE_MAP));
 
   // Check if there are more values waiting, if so re-send a new request to get other values
-  if (start + len < total) {
+  // Only send a new request if the current was non-empty. This avoids an infinite loop if the device announces more slots that it actually has.
+  if ((non_empty) && (start + len < total)) {
     // there are more values to read
 #ifdef USE_ZIGBEE_ZNP
       Z_Send_State_or_Map(shortaddr, start + len, lqi ? ZDO_MGMT_LQI_REQ : ZDO_MGMT_BIND_REQ);
diff --git a/tasmota/xdrv_23_zigbee_A_impl.ino b/tasmota/xdrv_23_zigbee_A_impl.ino
index f7d6fbdc7..9e35decee 100644
--- a/tasmota/xdrv_23_zigbee_A_impl.ino
+++ b/tasmota/xdrv_23_zigbee_A_impl.ino
@@ -1943,7 +1943,7 @@ void ZigbeeShowMap(void) {
   } else {
     WSContentSend_P(PSTR(
       "<script type=\"text/javascript\" src=\"https://unpkg.com/vis-network/standalone/umd/vis-network.min.js\"></script>"
-      "<div id=\"mynetwork\" style=\"background-color:#fff;width:800px;height:400px;border:1px solid lightgray;resize:both;\"></div>"
+      "<div id=\"mynetwork\" style=\"background-color:#fff;color:#000;width:800px;height:400px;border:1px solid lightgray;resize:both;\">Unable to load vis.js</div>"
       "<script type=\"text/javascript\">"
       "var container=document.getElementById(\"mynetwork\");"
       "var options={groups:{o:{shape:\"circle\",color:\"#d55\"},r:{shape:\"box\",color:\"#fb7\"},e:{shape:\"ellipse\",color:\"#adf\"}}};"