diff --git a/src/shared/Core/Window/Window.cpp b/src/shared/Core/Window/Window.cpp
index 2d5ebbecab4372b15c592d31d74d0d31a8262e3c..2153c040aea5c16d02d651c1fcea950f475fb4ab 100644
--- a/src/shared/Core/Window/Window.cpp
+++ b/src/shared/Core/Window/Window.cpp
@@ -36,11 +36,6 @@ Window::Window(XmlObject configuration)
     }
 }
 
-Window::~Window()
-{
-    MessageBroker::getInstance().unsubscribeFromAll(activeModule);
-}
-
 void Window::setChild(std::shared_ptr<Module> module)
 {
     Module *rawModule  = module.get();
@@ -55,7 +50,6 @@ void Window::replaceChild(Module *_oldModule, std::shared_ptr<Module> newModule)
 {
     std::shared_ptr<Module> oldModule = this->activeModule;
     setChild(newModule);
-    MessageBroker::getInstance().unsubscribeFromAll(oldModule);
 }
 
 void Window::closeChild(Module *module) { close(); }