diff --git a/src/UserData/UserDataStorage.cpp b/src/UserData/UserDataStorage.cpp
index 6137284..466ae94 100644
--- a/src/UserData/UserDataStorage.cpp
+++ b/src/UserData/UserDataStorage.cpp
@@ -3,5 +3,4 @@
 
 namespace Porygon::UserData {
     UserDataStorage::_internalDataStorage UserDataStorage::_internal = UserDataStorage::_internalDataStorage();
-    std::mutex UserDataStorage::_internalDataStorage::_userDataMutex = std::mutex();
 }
\ No newline at end of file
diff --git a/src/UserData/UserDataStorage.hpp b/src/UserData/UserDataStorage.hpp
index cb99ec6..a206c0a 100644
--- a/src/UserData/UserDataStorage.hpp
+++ b/src/UserData/UserDataStorage.hpp
@@ -12,7 +12,7 @@ namespace Porygon::UserData {
         class _internalDataStorage {
         public:
             std::unordered_map<uint32_t, UserData*> _userData;
-            static std::mutex _userDataMutex;
+            std::mutex _userDataMutex;
 
             ~_internalDataStorage(){
                 for (auto u: _userData){
@@ -31,12 +31,12 @@ namespace Porygon::UserData {
 
     public:
         static void RegisterType(uint32_t i, UserData *ud) {
-            std::lock_guard<std::mutex> guard(_internalDataStorage::_userDataMutex);
+            std::lock_guard<std::mutex> guard(_internal._userDataMutex);
             UserDataStorage::_internal._userData.insert({i, ud});
         }
 
         static void ClearTypes(){
-            std::lock_guard<std::mutex> guard(_internalDataStorage::_userDataMutex);
+            std::lock_guard<std::mutex> guard(_internal._userDataMutex);
             for (auto u: _internal._userData){
                 delete u.second;
             }