diff --git a/apps/aqhome-tool/data/watch.c b/apps/aqhome-tool/data/watch.c
index 27a7284..79846a7 100644
--- a/apps/aqhome-tool/data/watch.c
+++ b/apps/aqhome-tool/data/watch.c
@@ -171,7 +171,7 @@ int _doWatch(GWEN_DB_NODE *dbArgs)
   int timeoutInSeconds;
   const char *tmpl;
 
-  timeoutInSeconds=GWEN_DB_GetIntValue(dbArgs, "timeout", 0, 5);
+  timeoutInSeconds=GWEN_DB_GetIntValue(dbArgs, "timeout", 0, 0);
   tmpl=GWEN_DB_GetCharValue(dbArgs, "template", 0, "$(datapoint/timestampAsDate)\t$(datapoint/datapoint)\t$(value/nameForSystem)");
 
   epTcp=Utils_SetupBrokerClientEndpoint(dbArgs, AQH_IPCENDPOINT_FLAGS_WANTUPDATES);
@@ -197,7 +197,7 @@ void _awaitAndPrintChanges(GWEN_MSG_ENDPOINT *epTcp, int timeoutInSeconds, const
   for (;;) {
     GWEN_MSG *msg;
 
-    msg=Utils_WaitForSpecificIpcMessage(epTcp, AQH_MSGTYPE_IPC_DATA_DATACHANGED, 2);
+    msg=Utils_WaitForSpecificIpcMessage(epTcp, AQH_MSGTYPE_IPC_DATA_DATACHANGED, 5);
     if (msg) {
       uint16_t code;