diff --git a/include/EventManager/Manager.hpp b/include/EventManager/Manager.hpp
index 3fb80a3..7a7f820 100644
--- a/include/EventManager/Manager.hpp
+++ b/include/EventManager/Manager.hpp
@@ -50,6 +50,9 @@
 
      /// map holding all the event type and plugin combinations
      std::map<std::uint32_t, std::list<std::shared_ptr<EventManager::Participant>>> eventMap_;
+    
+     /// mutex to protect the eventMap
+     std::mutex mutexEventMap_;
 
      /// queue for incomng events
      std::queue<std::shared_ptr<EventManager::Event>> eventQueue_;
diff --git a/src/EventManager/Manager.cpp b/src/EventManager/Manager.cpp
index 8255e82..09f8557 100644
--- a/src/EventManager/Manager.cpp
+++ b/src/EventManager/Manager.cpp
@@ -12,6 +12,7 @@
  #include <EventManager/Participant.hpp>
  #include <iostream>
  #include <algorithm>
+#include <mutex>
 
  void EventManager::Manager::startMain_()
  {
@@ -207,6 +208,7 @@
 
  void EventManager::Manager::subscribe(std::uint32_t type, std::shared_ptr<EventManager::Participant> participant)
  {
+   std::lock_guard<std::mutex> lockGuard(mutexEventMap_);
 
    // check if participant is already registered
    auto it = eventMap_.find(type);
@@ -231,7 +233,8 @@
 
  void EventManager::Manager::unsubscribe(std::uint32_t type, std::shared_ptr<EventManager::Participant> participant)
  {
-
+   std::lock_guard<std::mutex> lockGuard(mutexEventMap_);
+   
    auto it = eventMap_.find(type);
 
    if (it == eventMap_.end())