diff --git a/meshtastic/node.py b/meshtastic/node.py
index c12f7779..c5a57bdd 100644
--- a/meshtastic/node.py
+++ b/meshtastic/node.py
@@ -52,7 +52,7 @@ def showChannels(self):
                 # don't show disabled channels
                 if channel_pb2.Channel.Role.Name(c.role) != "DISABLED":
                     print(
-                        f"  {channel_pb2.Channel.Role.Name(c.role)} psk={pskToString(c.settings.psk)} {cStr}"
+                        f"  Index {c.index}: {channel_pb2.Channel.Role.Name(c.role)} psk={pskToString(c.settings.psk)} {cStr}"
                     )
         publicURL = self.getURL(includeAll=False)
         adminURL = self.getURL(includeAll=True)
@@ -691,13 +691,7 @@ def onResponseRequestChannel(self, p):
         # for stress testing, we can always download all channels
         fastChannelDownload = True
 
-        # Once we see a response that has NO settings, assume
-        # we are at the end of channels and stop fetching
-        quitEarly = (
-            c.role == channel_pb2.Channel.Role.DISABLED
-        ) and fastChannelDownload
-
-        if quitEarly or index >= 8 - 1:
+        if index >= 8 - 1:
             logging.debug("Finished downloading channels")
 
             self.channels = self.partialChannels