diff --git a/src/EntityManager.cpp b/src/EntityManager.cpp
index 744bcf8..b36610b 100644
--- a/src/EntityManager.cpp
+++ b/src/EntityManager.cpp
@@ -311,7 +311,8 @@
             auto deviceValue = properties.find(matchProp);
             if (deviceValue != properties.end())
             {
-                deviceMatches = matchProbe(matchJSON, deviceValue->second);
+                deviceMatches =
+                    deviceMatches && matchProbe(matchJSON, deviceValue->second);
             }
             else
             {