diff --git a/include/EventManager/Participant.hpp b/include/EventManager/Participant.hpp
index db3cc4a..0ca39e2 100644
--- a/include/EventManager/Participant.hpp
+++ b/include/EventManager/Participant.hpp
@@ -162,6 +162,11 @@
       */
       void disconnect(std::shared_ptr<EventManager::Participant> participant);
 
+      /**
+      * @brief disconnect this participant from the event manager 
+      */
+      void disconnect();
+
     public:
       /**
       * @brief Constructor setting the participant up for use
diff --git a/src/EventManager/Participant.cpp b/src/EventManager/Participant.cpp
index 8e2d906..f325406 100644
--- a/src/EventManager/Participant.cpp
+++ b/src/EventManager/Participant.cpp
@@ -40,6 +40,16 @@ void EventManager::Participant::disconnect(std::shared_ptr<EventManager::Partici
 }
 
 
+void EventManager::Participant::disconnect()
+{
+  if (manager_ == nullptr)
+  {
+    throw std::runtime_error("no event manager set yet");
+  }
+  manager_->disconnect(shared_from_this());
+}
+
+
 void EventManager::Participant::emit(std::shared_ptr<EventManager::Event> event)
 {
   {