diff --git a/Socket.cpp b/Socket.cpp
index aa8a47023c..f2eeb14f1e 100644
--- a/Socket.cpp
+++ b/Socket.cpp
@@ -53,7 +53,9 @@ int Socket::close()
         return 0;
     }
 
-    void *socket = _socket;
+    _iface->socket_attach(_socket, 0, 0);
+
+    void *volatile socket = _socket;
     _socket = 0;
     return _iface->socket_close(socket);
 }