diff --git a/src/EventManager/Manager.cpp b/src/EventManager/Manager.cpp
index b85d051..f6f2ef4 100644
--- a/src/EventManager/Manager.cpp
+++ b/src/EventManager/Manager.cpp
@@ -383,6 +383,9 @@ void EventManager::Manager::processDisconnect_( std::shared_ptr<EventManager::Pa
   // before the participant gets disconnected it has to be unscheduled
   processDisableScheduling_( participant ); 
 
+  // unsubscribe plugin from all events
+  unsubscribe(participant);
+
   std::lock_guard<std::mutex> guard(mutexParticipants_);
   auto it = std::find( participants_.begin(), participants_.end(), participant );
   if( it != participants_.end() )