diff --git a/apps/aqhome-nodes/db.c b/apps/aqhome-nodes/db.c
index a90fab9..59818f4 100644
--- a/apps/aqhome-nodes/db.c
+++ b/apps/aqhome-nodes/db.c
@@ -248,7 +248,8 @@ void _handleMsgDevice(AQHOMED *aqh, const GWEN_MSG *msg)
       _assignDeviceId(aqh, ni, uid);
     _updateTimestampLastChange(ni);
     AQH_NodeDb_SetModified(aqh->nodeDb);
-    _announceNodeValues(aqh, ni);
+    if (uid!=0x00000000L && uid!=0xffffffff)
+      _announceNodeValues(aqh, ni);
   }
   else {
     DBG_INFO(AQH_LOGDOMAIN, "Error handling message");