diff --git a/src/queue/Queue.cxx b/src/queue/Queue.cxx
index 720778099..a1dcce3b4 100644
--- a/src/queue/Queue.cxx
+++ b/src/queue/Queue.cxx
@@ -22,15 +22,10 @@
 #include "DetachedSong.hxx"
 
 Queue::Queue(unsigned _max_length)
-	:max_length(_max_length), length(0),
-	 version(1),
+	:max_length(_max_length),
 	 items(new Item[max_length]),
 	 order(new unsigned[max_length]),
-	 id_table(max_length * HASH_MULT),
-	 repeat(false),
-	 single(false),
-	 consume(false),
-	 random(false)
+	 id_table(max_length * HASH_MULT)
 {
 }
 
diff --git a/src/queue/Queue.hxx b/src/queue/Queue.hxx
index 06e800479..66ecc5a0b 100644
--- a/src/queue/Queue.hxx
+++ b/src/queue/Queue.hxx
@@ -73,10 +73,10 @@ struct Queue {
 	unsigned max_length;
 
 	/** number of songs in the queue */
-	unsigned length;
+	unsigned length = 0;
 
 	/** the current version number */
-	uint32_t version;
+	uint32_t version = 1;
 
 	/** all songs in "position" order */
 	Item *items;
@@ -89,16 +89,16 @@ struct Queue {
 
 	/** repeat playback when the end of the queue has been
 	    reached? */
-	bool repeat;
+	bool repeat = false;
 
 	/** play only current song. */
-	bool single;
+	bool single = false;
 
 	/** remove each played files. */
-	bool consume;
+	bool consume = false;
 
 	/** play back songs in random order? */
-	bool random;
+	bool random = false;
 
 	/** random number generator for shuffle and random mode */
 	LazyRandomEngine rand;