diff --git a/device/peer.go b/device/peer.go
index 8006b9f..ac85c94 100644
--- a/device/peer.go
+++ b/device/peer.go
@@ -213,6 +213,8 @@ func (peer *Peer) Start() {
 
 	// wait for routines to start
 
+	// RoutineNonce writes to the encryption queue; keep it alive until we are done.
+	device.queue.encryption.wg.Add(1)
 	go peer.RoutineNonce()
 	go peer.RoutineSequentialSender()
 	go peer.RoutineSequentialReceiver()
diff --git a/device/send.go b/device/send.go
index c75d23e..55df4b3 100644
--- a/device/send.go
+++ b/device/send.go
@@ -352,9 +352,6 @@ func (peer *Peer) RoutineNonce() {
 	device := peer.device
 	logDebug := device.log.Debug
 
-	// We write to the encryption queue; keep it alive until we are done.
-	device.queue.encryption.wg.Add(1)
-
 	flush := func() {
 		for {
 			select {