diff --git a/lib/nodes/mqtt.cpp b/lib/nodes/mqtt.cpp
index 9170800f0..8e1ddbed1 100644
--- a/lib/nodes/mqtt.cpp
+++ b/lib/nodes/mqtt.cpp
@@ -479,6 +479,10 @@ int villas::node::mqtt_stop(NodeCompat *n)
 	if (ret != MOSQ_ERR_SUCCESS)
 		goto mosquitto_error;
 
+	ret = queue_signalled_close(&m->queue);
+	if (ret)
+		return ret;
+
 	return 0;
 
 mosquitto_error:
diff --git a/lib/nodes/redis.cpp b/lib/nodes/redis.cpp
index 68b36580d..7d5879964 100644
--- a/lib/nodes/redis.cpp
+++ b/lib/nodes/redis.cpp
@@ -563,6 +563,10 @@ int villas::node::redis_stop(NodeCompat *n)
 			break;
 	}
 
+	ret = queue_signalled_close(&r->queue);
+	if (ret)
+		return ret;
+
 	return 0;
 }