diff --git a/src/IRCSock.cpp b/src/IRCSock.cpp
index b6d7f1bb..4c4ab4e9 100644
--- a/src/IRCSock.cpp
+++ b/src/IRCSock.cpp
@@ -378,7 +378,7 @@ bool CIRCSock::OnCapabilityMessage(CMessage& Message) {
         sArgs = Message.GetParam(2);
     }
 
-    std::map<CString, std::function<void(bool bVal)>> mSupportedCaps = {
+    static std::map<CString, std::function<void(bool bVal)>> mSupportedCaps = {
         {"multi-prefix", [this](bool bVal) { m_bNamesx = bVal; }},
         {"userhost-in-names", [this](bool bVal) { m_bUHNames = bVal; }},
         {"cap-notify", [](bool bVal) {}},
diff --git a/src/Message.cpp b/src/Message.cpp
index 4aadc48d..f96fa05e 100644
--- a/src/Message.cpp
+++ b/src/Message.cpp
@@ -276,7 +276,7 @@ void CMessage::InitType() {
             m_eType = Type::Notice;
         }
     } else {
-        std::map<CString, Type> mTypes = {
+        static std::map<CString, Type> mTypes = {
             {"ACCOUNT", Type::Account},
             {"AWAY", Type::Away},
             {"CAP", Type::Capability},