diff --git a/app/src/main/java/com/geeksville/mesh/repository/radio/TCPInterface.kt b/app/src/main/java/com/geeksville/mesh/repository/radio/TCPInterface.kt
index ee368063b..ba6d71271 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/radio/TCPInterface.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/radio/TCPInterface.kt
@@ -50,10 +50,10 @@ class TCPInterface(service: RadioInterfaceService, private val address: String)
         val s = socket
         if (s != null) {
             debug("Closing TCP socket")
-            socket = null
             outStream.close()
             inStream.close()
             s.close()
+            socket = null
         }
         super.onDeviceDisconnect(waitForStopped)
     }