diff --git a/lib/ZwaveClient.ts b/lib/ZwaveClient.ts
index 0ebca46a12..d10f3b3db3 100644
--- a/lib/ZwaveClient.ts
+++ b/lib/ZwaveClient.ts
@@ -570,6 +570,7 @@ export type ZwaveConfig = {
 	logLevel?: LogManager.LogLevel
 	commandsTimeout?: number
 	sendToSleepTimeout?: number
+	responseTimeout?: number
 	enableStatistics?: boolean
 	disclaimerVersion?: number
 	options?: ZWaveOptions
@@ -2117,6 +2118,7 @@ class ZwaveClient extends TypedEventEmitter<ZwaveClientEventCallbacks> {
 				timeouts: {
 					report: this.cfg.higherReportsTimeout ? 10000 : undefined,
 					sendToSleep: this.cfg.sendToSleepTimeout,
+					response: this.cfg.responseTimeout,
 				},
 				userAgent: {
 					[pkgjson.name]: pkgjson.version,
diff --git a/src/views/Settings.vue b/src/views/Settings.vue
index 2a888be812..03e0077fd9 100644
--- a/src/views/Settings.vue
+++ b/src/views/Settings.vue
@@ -807,8 +807,22 @@
 											"
 											label="Send to sleep timeout"
 											required
-											suffix="seconds"
-											hint="How long to wait without pending commands before sending a node back to sleep"
+											persistent-hint
+											suffix="ms"
+											hint="How long to wait without pending commands before sending a node back to sleep. Leave blank to use default (250ms)"
+											type="number"
+										></v-text-field>
+									</v-col>
+									<v-col cols="6">
+										<v-text-field
+											v-model.number="
+												newZwave.responseTimeout
+											"
+											label="Response timeout"
+											required
+											persistent-hint
+											suffix="ms"
+											hint="How long to wait for a controller response. Leave blank to use default (10000ms)"
 											type="number"
 										></v-text-field>
 									</v-col>