diff --git a/src/associations.cpp b/src/associations.cpp
index 1899826..3293b4e 100644
--- a/src/associations.cpp
+++ b/src/associations.cpp
@@ -10,9 +10,14 @@
                            const std::string& assocPath,
                            AssociationMaps& assocMaps)
 {
-    auto& iface = assocMaps.ifaces[assocPath];
-    auto& i = std::get<ifacePos>(iface);
-    auto& endpoints = std::get<endpointsPos>(iface);
+    // Don't create an entry in assocMaps.ifaces if not needed.
+    auto iface = assocMaps.ifaces.find(assocPath);
+    if (iface == assocMaps.ifaces.end())
+    {
+        return;
+    }
+    auto& i = std::get<ifacePos>(iface->second);
+    auto& endpoints = std::get<endpointsPos>(iface->second);
 
     // If the interface already exists, only need to update
     // the property value, otherwise create it
@@ -28,14 +33,16 @@
             i->set_property("endpoints", endpoints);
         }
     }
-    else
+    else if (!endpoints.empty())
     {
-        if (!endpoints.empty())
-        {
-            i = objectServer.add_interface(assocPath, xyzAssociationInterface);
-            i->register_property("endpoints", endpoints);
-            i->initialize();
-        }
+        i = objectServer.add_interface(assocPath, xyzAssociationInterface);
+        i->register_property("endpoints", endpoints);
+        i->initialize();
+    }
+
+    if (endpoints.empty())
+    {
+        assocMaps.ifaces.erase(iface);
     }
 }
 
@@ -50,8 +57,12 @@
         return;
     }
 
-    auto& iface = assocMaps.ifaces[assocPath];
-    auto& endpoints = std::get<endpointsPos>(iface);
+    auto iface = assocMaps.ifaces.find(assocPath);
+    if (iface == assocMaps.ifaces.end())
+    {
+        return;
+    }
+    auto& endpoints = std::get<endpointsPos>(iface->second);
 
     if (endpoints.size() > endpointsCountTimerThreshold)
     {
diff --git a/src/test/associations.cpp b/src/test/associations.cpp
index 62aefab..fe0a826 100644
--- a/src/test/associations.cpp
+++ b/src/test/associations.cpp
@@ -313,9 +313,9 @@
     associationChanged(io, *server, associations, defaultSourcePath,
                        defaultDbusSvc, interfaceMap, assocMaps);
 
-    // Should have 3 entries in AssociationInterfaces, one is just missing an
-    // endpoint
-    EXPECT_EQ(assocMaps.ifaces.size(), 3);
+    // Should have 2 entries in AssociationInterfaces
+    // The one missing an endpoint is not added.
+    EXPECT_EQ(assocMaps.ifaces.size(), 2);
 
     // Change to existing interface so it will be removed here
     auto intfEndpoints =