diff --git a/lib/super_node.cpp b/lib/super_node.cpp
index 0a297f2ed..33ff2fbdb 100644
--- a/lib/super_node.cpp
+++ b/lib/super_node.cpp
@@ -54,6 +54,10 @@ SuperNode::SuperNode() :
 	web(&api),
 	json(nullptr)
 {
+	nodes.state = STATE_DESTROYED;
+	paths.state = STATE_DESTROYED;
+	plugins.state = STATE_DESTROYED;
+
 	list_init(&nodes);
 	list_init(&paths);
 	list_init(&plugins);
diff --git a/src/villas-signal.cpp b/src/villas-signal.cpp
index 240ee66aa..59b059a53 100644
--- a/src/villas-signal.cpp
+++ b/src/villas-signal.cpp
@@ -171,11 +171,13 @@ int main(int argc, char *argv[])
 
 	const char *format = "villas.human"; /** @todo hardcoded for now */
 
-	struct node n;
-	struct io io;
-	struct pool q;
+	struct node n = { .state = STATE_DESTROYED };
+	struct io io = { .state = STATE_DESTROYED };
+	struct pool q = { .state = STATE_DESTROYED };
 	struct sample *t;
 
+	q.queue.state = STATE_DESTROYED;
+
 	Logger logger = logging.get("signal");
 
 	ret = utils::signals_init(quit);