diff --git a/libnymea-core/devices/devicemanagerimplementation.cpp b/libnymea-core/devices/devicemanagerimplementation.cpp
index 91ee8f5f..eb055792 100644
--- a/libnymea-core/devices/devicemanagerimplementation.cpp
+++ b/libnymea-core/devices/devicemanagerimplementation.cpp
@@ -1417,7 +1417,7 @@ void DeviceManagerImplementation::onEventTriggered(const Event &event)
 {
     // Doing some sanity checks here...
     Device *device = m_configuredDevices.value(event.deviceId());
-    if (!device) {
+    if (!device || !m_configuredDevices.contains(device->id())) {
         qCWarning(dcDeviceManager()) << "Invalid device id in emitted event. Not forwarding event.";
         return;
     }