diff --git a/addons/attach/attach.js b/addons/attach/attach.js
index cfae11db..992c790a 100644
--- a/addons/attach/attach.js
+++ b/addons/attach/attach.js
@@ -47,7 +47,12 @@
       var term = this;
 
       term.off('data', term._sendData);
-      socket.removeEventListener('message', term._getMessage);
+
+      socket = (typeof socket == 'undefined') ? term.socket : socket;
+
+      if (socket) {
+        socket.removeEventListener('message', term._getMessage);
+      }
 
       delete term.socket;
     };