diff --git a/src/account.cpp b/src/account.cpp
index 6f0892f86bfc995ba13ce88ae665845f89839a92..ff36b7e7623eab9648c64f365b172623052b9908 100644
--- a/src/account.cpp
+++ b/src/account.cpp
@@ -390,7 +390,7 @@ Account::getDefaultCodecDetails(const unsigned& codecId)
             return videoCodec->getCodecSpecifications();
         }
     }
-    return {{}};
+    return {};
 }
 
 #define find_iter()                                    \
diff --git a/src/account_factory.h b/src/account_factory.h
index 2d1d11f6f2b6993d52cd0958cf3a8348f986aab7..34b7e6a4b61644f20bc681c41f1440e096a27c1c 100644
--- a/src/account_factory.h
+++ b/src/account_factory.h
@@ -132,8 +132,8 @@ class AccountFactory {
 
     private:
         mutable std::recursive_mutex mutex_ = {};
-        std::map<std::string, std::function<std::shared_ptr<Account>(const std::string&)> > generators_ = {{}};
-        std::map<std::string, AccountMap<Account> > accountMaps_ = {{}};
+        std::map<std::string, std::function<std::shared_ptr<Account>(const std::string&)> > generators_ = {};
+        std::map<std::string, AccountMap<Account> > accountMaps_ = {};
         std::weak_ptr<Account> ip2ip_account_ = {}; //! cached pointer on IP2IP account
 
         template <class T>
diff --git a/src/client/configurationmanager.cpp b/src/client/configurationmanager.cpp
index a7d9d8f630dca3c25b8fe51cca99ea7a32b1ffbf..077fd5bd27272da51289ab593a715e76695e7080 100644
--- a/src/client/configurationmanager.cpp
+++ b/src/client/configurationmanager.cpp
@@ -162,7 +162,7 @@ validateCertificateRaw(const std::string&,
     }
 #else
     RING_WARN("TLS not supported");
-    return {{}};
+    return {};
 #endif
 }
 
@@ -178,7 +178,7 @@ getCertificateDetails(const std::string& certificate)
 #else
     RING_WARN("TLS not supported");
 #endif
-    return {{}};
+    return {};
 }
 
 std::map<std::string, std::string>
@@ -193,7 +193,7 @@ getCertificateDetailsRaw(const std::vector<uint8_t>& certificate_raw)
 #else
     RING_WARN("TLS not supported");
 #endif
-    return {{}};
+    return {};
 }
 
 std::vector<std::string>
@@ -287,7 +287,7 @@ getTrustRequests(const std::string& accountId)
 {
     if (auto acc = ring::Manager::instance().getAccount<ring::RingAccount>(accountId))
         return acc->getTrustRequests();
-    return {{}};
+    return {};
 }
 
 bool
@@ -325,7 +325,7 @@ getAccountTemplate(const std::string& accountType)
     else if (accountType == Account::ProtocolNames::IAX)
         return ring::IAXAccount("dummy").getAccountDetails();
 #endif
-    return {{}};
+    return {};
 }
 
 std::string
@@ -426,7 +426,7 @@ getCodecDetails(const std::string& accountID, const unsigned& codecId)
     if (!codec)
     {
         ring::emitSignal<ConfigurationSignal::Error>(CODECS_NOT_LOADED);
-        return {{}};
+        return {};
     }
 
     if (codec->systemCodecInfo.mediaType & ring::MEDIA_AUDIO)
@@ -438,7 +438,7 @@ getCodecDetails(const std::string& accountID, const unsigned& codecId)
             return foundCodec->getCodecSpecifications();
 
     ring::emitSignal<ConfigurationSignal::Error>(CODECS_NOT_LOADED);
-    return {{}};
+    return {};
 }
 
 std::vector<unsigned>
diff --git a/src/manager.cpp b/src/manager.cpp
index 8a98e0fded1cb18267acd1f562cfd4874f5d5fbe..4803aa6d4f5e40c8b6bd419bce6fbf9c4c680521 100644
--- a/src/manager.cpp
+++ b/src/manager.cpp
@@ -2506,7 +2506,7 @@ Manager::getVolatileAccountDetails(const std::string& accountID) const
         return account->getVolatileAccountDetails();
     } else {
         RING_ERR("Could not get volatile account details on a non-existing accountID %s", accountID.c_str());
-        return {{}};
+        return {};
     }
 }
 
diff --git a/src/plugin_manager.h b/src/plugin_manager.h
index 1c04f160576de97f8fa2895dfd52a40904bc10fe..c429053a99231215812320706d73b4f53645b58d 100644
--- a/src/plugin_manager.h
+++ b/src/plugin_manager.h
@@ -147,18 +147,18 @@ class PluginManager
             nullptr, // set by PluginManager constructor
             registerObjectFactory_, invokeService_,
         };
-        PluginMap           dynPluginMap_ = {{}}; // Only dynamic loaded plugins
+        PluginMap           dynPluginMap_ = {}; // Only dynamic loaded plugins
         ExitFuncVec         exitFuncVec_ = {};
-        ObjectFactoryMap    exactMatchMap_ = {{}};
+        ObjectFactoryMap    exactMatchMap_ = {};
         ObjectFactoryVec    wildCardVec_ = {};
 
         // Storage used during plugin initialisation.
         // Will be copied into previous ones only if the initialisation success.
-        ObjectFactoryMap    tempExactMatchMap_ = {{}};
+        ObjectFactoryMap    tempExactMatchMap_ = {};
         ObjectFactoryVec    tempWildCardVec_ = {};
 
         // registered services
-        std::map<std::string, ServiceFunction> services_ {{}};
+        std::map<std::string, ServiceFunction> services_ {};
 };
 
 } // namespace ring