diff --git a/tripleoclient/plugin.py b/tripleoclient/plugin.py
index 1f9b9eb9c..87a922454 100644
--- a/tripleoclient/plugin.py
+++ b/tripleoclient/plugin.py
@@ -167,7 +167,10 @@ class WebsocketClient(object):
 
     def __exit__(self, *exc):
         """Call cleanup when exiting the context manager"""
-        self.cleanup()
+        try:
+            self.cleanup()
+        except websocket.WebSocketConnectionClosedException:
+            pass
 
 
 class ClientWrapper(object):