diff --git a/src/EntityManager.cpp b/src/EntityManager.cpp
index 5fe252c..5aa77bf 100644
--- a/src/EntityManager.cpp
+++ b/src/EntityManager.cpp
@@ -1290,6 +1290,7 @@
             {
                 std::visit([&](auto&& val) { keyPair.value() = val; },
                            foundDevicePair.second);
+                return;
             }
 
             // We probably just invalidated the pointer above, so set it to null