diff --git a/libnymea-core/integrations/thingmanagerimplementation.cpp b/libnymea-core/integrations/thingmanagerimplementation.cpp
index a13da5c6..537c1703 100644
--- a/libnymea-core/integrations/thingmanagerimplementation.cpp
+++ b/libnymea-core/integrations/thingmanagerimplementation.cpp
@@ -302,7 +302,7 @@ ThingDiscoveryInfo* ThingManagerImplementation::discoverThings(const ThingClassI
     }
     ParamList effectiveParams = buildParams(thingClass.discoveryParamTypes(), params);
 
-    ThingDiscoveryInfo *discoveryInfo = new ThingDiscoveryInfo(thingClassId, effectiveParams, this, 30000);
+    ThingDiscoveryInfo *discoveryInfo = new ThingDiscoveryInfo(thingClassId, effectiveParams, this, 40000);
     connect(discoveryInfo, &ThingDiscoveryInfo::finished, this, [this, discoveryInfo](){
         if (discoveryInfo->status() != Thing::ThingErrorNoError) {
             qCWarning(dcThingManager()) << "Discovery failed:" << discoveryInfo->status() << discoveryInfo->displayMessage();
@@ -1341,7 +1341,7 @@ ThingActionInfo *ThingManagerImplementation::executeAction(const Action &action)
     ParamList finalParams = buildParams(actionType.paramTypes(), action.params());
     finalAction.setParams(finalParams);
 
-    ThingActionInfo *info = new ThingActionInfo(thing, finalAction, this, 30000);
+    ThingActionInfo *info = new ThingActionInfo(thing, finalAction, this, 15000);
 
     IntegrationPlugin *plugin = m_integrationPlugins.value(thing->pluginId());
     if (!plugin) {
diff --git a/libnymea/jsonrpc/jsonreply.cpp b/libnymea/jsonrpc/jsonreply.cpp
index fe86cbfd..8f407c1d 100644
--- a/libnymea/jsonrpc/jsonreply.cpp
+++ b/libnymea/jsonrpc/jsonreply.cpp
@@ -134,10 +134,10 @@ void JsonReply::setCommandId(int commandId)
     m_commandId = commandId;
 }
 
-/*! Start the timeout timer for this \l{JsonReply}. The default timeout is 15 seconds. */
+/*! Start the timeout timer for this \l{JsonReply}. The default timeout is 45 seconds. */
 void JsonReply::startWait()
 {
-    m_timeout.start(30000);
+    m_timeout.start(45000);
 }
 
 void JsonReply::timeout()