diff --git a/CodenameOne/src/com/codename1/io/Socket.java b/CodenameOne/src/com/codename1/io/Socket.java
index 91633b8873..da5ce30f58 100644
--- a/CodenameOne/src/com/codename1/io/Socket.java
+++ b/CodenameOne/src/com/codename1/io/Socket.java
@@ -133,11 +133,10 @@ public void close() throws IOException {
                         throw new RuntimeException(e.getMessage());
                     }
                 }
-                input = null;
-                output = null;
                 if(Util.getImplementation().isSocketConnected(connection[0])) {
                     Util.getImplementation().disconnectSocket(connection[0]);
                 }
+                connection[0] = null;
             }
         };
     }