diff --git a/app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt
index 38a099200..71b1f8587 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt
@@ -169,11 +169,18 @@ class MessagesFragment : ScreenFragment("Messages"), Logging {
             messagesAdapter.onMessagesChanged(it)
         })
 
+        // If connection state _OR_ myID changes we have to fix our ability to edit outgoing messages
         model.isConnected.observe(viewLifecycleOwner, Observer { connected ->
             // If we don't know our node ID and we are offline don't let user try to send
             textInputLayout.isEnabled =
                 connected != MeshService.ConnectionState.DISCONNECTED && model.nodeDB.myId.value != null
         })
+
+        model.nodeDB.myId.observe(viewLifecycleOwner, Observer { myId ->
+            // If we don't know our node ID and we are offline don't let user try to send
+            textInputLayout.isEnabled =
+                model.isConnected.value != MeshService.ConnectionState.DISCONNECTED && myId != null
+        })
     }
 
     private val dateFormat = SimpleDateFormat("h:mm a")