diff --git a/server.go b/server.go
index 6004dbf8..26cf06b8 100644
--- a/server.go
+++ b/server.go
@@ -640,11 +640,11 @@ out:
 				}
 				s.peersMtx.RUnlock()
 
+				sMsg.errChan <- nil
+
 				for _, msg := range sMsg.msgs {
 					targetPeer.queueMsg(msg, nil)
 				}
-
-				sMsg.errChan <- nil
 			}()
 		case query := <-s.queries:
 			switch msg := query.(type) {