diff --git a/libweave/src/base_api_handler.cc b/libweave/src/base_api_handler.cc
index b9e4de4..f05deff 100644
--- a/libweave/src/base_api_handler.cc
+++ b/libweave/src/base_api_handler.cc
@@ -28,7 +28,7 @@
   device_info_->AddOnConfigChangedCallback(base::Bind(
       &BaseApiHandler::OnConfigChanged, weak_ptr_factory_.GetWeakPtr()));
 
-  const Config& config{device_info_->GetConfig()};
+  const Config& config = device_info_->GetConfig();
   base::DictionaryValue state;
   state.SetStringWithoutPathExpansion(kBaseStateFirmwareVersion,
                                       config.firmware_version());
@@ -52,7 +52,7 @@
 void BaseApiHandler::UpdateBaseConfiguration(Command* command) {
   command->SetProgress(base::DictionaryValue{}, nullptr);
 
-  const Config& config{device_info_->GetConfig()};
+  const Config& config = device_info_->GetConfig();
   std::string anonymous_access_role{config.local_anonymous_access_role()};
   bool discovery_enabled{config.local_discovery_enabled()};
   bool pairing_enabled{config.local_pairing_enabled()};
@@ -84,7 +84,7 @@
 void BaseApiHandler::UpdateDeviceInfo(Command* command) {
   command->SetProgress(base::DictionaryValue{}, nullptr);
 
-  const Config& config{device_info_->GetConfig()};
+  const Config& config = device_info_->GetConfig();
   std::string name{config.name()};
   std::string description{config.description()};
   std::string location{config.location()};
diff --git a/libweave/src/base_api_handler_unittest.cc b/libweave/src/base_api_handler_unittest.cc
index 7ffc3d9..d3b5281 100644
--- a/libweave/src/base_api_handler_unittest.cc
+++ b/libweave/src/base_api_handler_unittest.cc
@@ -115,7 +115,7 @@
     }
   })");
 
-  Config& config{*dev_reg_->GetMutableConfig()};
+  Config& config = *dev_reg_->GetMutableConfig();
 
   AddCommand(R"({
     'name' : 'base.updateBaseConfiguration',
@@ -204,7 +204,7 @@
     }
   })");
 
-  const Config& config{dev_reg_->GetConfig()};
+  const Config& config = dev_reg_->GetConfig();
   EXPECT_EQ("testName", config.name());
   EXPECT_EQ("testDescription", config.description());
   EXPECT_EQ("testLocation", config.location());