diff --git a/src/EntityManager.cpp b/src/EntityManager.cpp
index 3704f84..03d16f7 100644
--- a/src/EntityManager.cpp
+++ b/src/EntityManager.cpp
@@ -448,11 +448,11 @@
     }
     if (matchOne && ret)
     {
-        // match one could match multiple dbus values, which means we don't care
-        // what one we found so we shouldn't be using template replace. return
-        // an empty one
+        // match the last one
+        auto last = foundDevs.back();
         foundDevs.clear();
-        foundDevs.emplace_back(std::nullopt);
+
+        foundDevs.emplace_back(std::move(last));
     }
     return ret;
 }