diff --git a/src/EventManager/EventManager.cpp b/src/EventManager/EventManager.cpp
index 808e19ba..035dbfdc 100644
--- a/src/EventManager/EventManager.cpp
+++ b/src/EventManager/EventManager.cpp
@@ -3,19 +3,19 @@
 namespace Bloom
 {
     void EventManager::registerListener(std::shared_ptr<EventListener> listener) {
-        auto registerListenersLock = std::unique_lock(this->registerListenerMutex);
-        this->registeredListeners.insert(std::pair(listener->getId(), std::move(listener)));
+        auto registerListenersLock = std::unique_lock(EventManager::registerListenerMutex);
+        EventManager::registeredListeners.insert(std::pair(listener->getId(), std::move(listener)));
     }
 
     void EventManager::deregisterListener(size_t listenerId) {
-        auto registerListenersLock = std::unique_lock(this->registerListenerMutex);
-        this->registeredListeners.erase(listenerId);
+        auto registerListenersLock = std::unique_lock(EventManager::registerListenerMutex);
+        EventManager::registeredListeners.erase(listenerId);
     }
 
     void EventManager::triggerEvent(const std::shared_ptr<const Events::Event>& event) {
-        auto registerListenersLock = std::unique_lock(this->registerListenerMutex);
+        auto registerListenersLock = std::unique_lock(EventManager::registerListenerMutex);
 
-        for (const auto&[listenerId, listener] : this->registeredListeners) {
+        for (const auto&[listenerId, listener] : EventManager::registeredListeners) {
             if (listener->isEventTypeRegistered(event->getType())) {
                 listener->registerEvent(event);
             }
@@ -23,9 +23,9 @@ namespace Bloom
     }
 
     bool EventManager::isEventTypeListenedFor(Events::EventType eventType) {
-        auto registerListenersLock = std::unique_lock(this->registerListenerMutex);
+        auto registerListenersLock = std::unique_lock(EventManager::registerListenerMutex);
 
-        for (const auto&[listenerId, listener] : this->registeredListeners) {
+        for (const auto& [listenerId, listener] : EventManager::registeredListeners) {
             if (listener->isEventTypeRegistered(eventType)) {
                 return true;
             }
diff --git a/src/EventManager/EventManager.hpp b/src/EventManager/EventManager.hpp
index e6132e7b..b5e40ff2 100644
--- a/src/EventManager/EventManager.hpp
+++ b/src/EventManager/EventManager.hpp
@@ -60,7 +60,7 @@ namespace Bloom
         /**
          * A mapping of listener IDs to registered listeners. Each registered listener is given an interger ID.
          */
-        std::map<size_t, std::shared_ptr<EventListener>> registeredListeners;
-        std::mutex registerListenerMutex;
+        static inline std::map<size_t, std::shared_ptr<EventListener>> registeredListeners;
+        static inline std::mutex registerListenerMutex;
     };
 }