diff --git a/src/common/connection_handlers.py b/src/common/connection_handlers.py
index a8f4b65c7..86a5f034a 100644
--- a/src/common/connection_handlers.py
+++ b/src/common/connection_handlers.py
@@ -1472,7 +1472,8 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream):
     def cleanup(self):
         ConnectionHandlersBase.cleanup(self)
         ConnectionCaps.cleanup(self)
-        ConnectionArchive.cleanup(self)
+        ConnectionArchive136.cleanup(self)
+        ConnectionArchive313.cleanup(self)
         ConnectionPubSub.cleanup(self)
         gajim.ged.remove_event_handler('http-auth-received', ged.CORE,
             self._nec_http_auth_received)