diff --git a/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DatabaseManager.java b/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DatabaseManager.java
index c7c98c5..76fd7d6 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DatabaseManager.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DatabaseManager.java
@@ -415,16 +415,19 @@
         getTransactions().stream().forEach(transactionManager::execute);
     }
 
-    protected <K, V> void registerMap(DefaultAsyncConsistentMap<K, V> map) {
-        // TODO: Support multiple local instances of the same map.
-        if (maps.putIfAbsent(map.name(), map) != null) {
-            throw new IllegalStateException("Map by name " + map.name() + " already exists");
+    protected <K, V> DefaultAsyncConsistentMap<K, V> registerMap(DefaultAsyncConsistentMap<K, V> map) {
+        DefaultAsyncConsistentMap<K, V> existing = maps.putIfAbsent(map.name(), map);
+        if (existing != null) {
+            // FIXME: We need to cleanly support different map instances with same name.
+            log.info("Map by name {} already exists", map.name());
+            return existing;
         }
 
         clusterCommunicator.<MapEvent<K, V>>addSubscriber(mapUpdatesSubject(map.name()),
                 map.serializer()::decode,
                 map::notifyLocalListeners,
                 eventDispatcher);
+        return map;
     }
 
     protected <K, V> void unregisterMap(DefaultAsyncConsistentMap<K, V> map) {
diff --git a/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DefaultConsistentMapBuilder.java b/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DefaultConsistentMapBuilder.java
index 24db74f..75b2505 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DefaultConsistentMapBuilder.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DefaultConsistentMapBuilder.java
@@ -77,7 +77,6 @@
                 event -> manager.clusterCommunicator.<MapEvent<K, V>>broadcast(event,
                         DatabaseManager.mapUpdatesSubject(name),
                         serializer::encode));
-        manager.registerMap(asyncMap);
-        return asyncMap;
+        return manager.registerMap(asyncMap);
     }
 }
\ No newline at end of file