diff --git a/protocol/messenger_mailserver_cycle.go b/protocol/messenger_mailserver_cycle.go
index 587e14b89..2c6e35aea 100644
--- a/protocol/messenger_mailserver_cycle.go
+++ b/protocol/messenger_mailserver_cycle.go
@@ -482,7 +482,8 @@ func (m *Messenger) handleMailserverCycleEvent(connectedPeers []ConnectedPeer) e
 	m.mailPeersMutex.Unlock()
 
 	// Only evaluate connected peers once a mailserver has been set
-	// otherwise
+	// otherwise, we would attempt to retrieve history and end up with a mailserver
+	// not available error
 	if m.mailserverCycle.activeMailserver != nil {
 		for _, connectedPeer := range connectedPeers {
 			id, err := m.mailserverAddressToID(connectedPeer.UniqueID)