diff --git a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
index 3ff6b3f8e..bb8ff8bfc 100644
--- a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
+++ b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
@@ -1290,7 +1290,7 @@ class MeshService : Service(), Logging {
     private fun fixupChannelList(lIn: List<ChannelProtos.Channel>): Array<ChannelProtos.Channel> {
         // When updating old firmware, we will briefly be told that there is zero channels
         val maxChannels =
-            max(myNodeInfo?.maxChannels ?: 10, 10) // If we don't have my node info, assume 10 channels
+            max(myNodeInfo?.maxChannels ?: 8, 8) // If we don't have my node info, assume 8 channels (source: apponly.options)
         val l = lIn.toMutableList()
         while (l.size < maxChannels) {
             val b = ChannelProtos.Channel.newBuilder()