diff --git a/src/aiko_services/main/process.py b/src/aiko_services/main/process.py
index d8baf26..6c2ad0b 100644
--- a/src/aiko_services/main/process.py
+++ b/src/aiko_services/main/process.py
@@ -225,7 +225,7 @@ def remove_message_handler(self, message_handler, topic):
             if len(self._message_handlers[topic]) == 0:
                 del self._message_handlers[topic]
                 if topic in self._message_handlers_binary_topics:
-                    del self._message_handlers_wildcard_topics[topic]
+                    del self._message_handlers_binary_topics[topic]
                 if topic in self._message_handlers_wildcard_topics:
                     del self._message_handlers_wildcard_topics[topic]
                 if self.message: