diff --git a/src/perform_scan.cpp b/src/perform_scan.cpp
index 44f284c..0ad6509 100644
--- a/src/perform_scan.cpp
+++ b/src/perform_scan.cpp
@@ -495,8 +495,6 @@
 
             pruneRecordExposes(*record);
 
-            recordDiscoveredIdentifiers(usedNames, indexes, probeName, *record);
-
             _systemConfiguration[recordName] = *record;
         }
         _missingConfigurations.erase(recordName);
@@ -504,6 +502,7 @@
         // We've processed the device, remove it and advance the
         // iterator
         itr = foundDevices.erase(itr);
+        recordDiscoveredIdentifiers(usedNames, indexes, probeName, *record);
     }
 
     std::optional<std::string> replaceStr;