diff --git a/messaging/messaging_pyx.pyx b/messaging/messaging_pyx.pyx
index a4ac5172b04ae7..ff55c310750fd1 100644
--- a/messaging/messaging_pyx.pyx
+++ b/messaging/messaging_pyx.pyx
@@ -18,7 +18,10 @@ cdef class Context:
     self.context = cppContext.create()
 
   def __dealloc__(self):
-    del self.context
+    pass
+    # Deleting the context will hang if sockets are still active
+    # TODO: Figure out a way to make sure the context is closed last
+    # del self.context
 
 
 cdef class Poller: