diff --git a/swarm/network/syncer.go b/swarm/network/syncer.go
index e540e236f5..c6c51934e6 100644
--- a/swarm/network/syncer.go
+++ b/swarm/network/syncer.go
@@ -477,7 +477,11 @@ LOOP:
 				// history channel is closed, waiting for new state (called from sync())
 				syncStates = self.syncStates
 				state.Synced = true // this signals that the  current segment is complete
-				state.synced <- false
+				select {
+				case state.synced <- false:
+				case <-self.quit:
+					break LOOP
+				}
 				justSynced = true
 				history = nil
 			}