diff --git a/agent/ae/ae.go b/agent/ae/ae.go
index 6d6735b413..83895f4d2b 100644
--- a/agent/ae/ae.go
+++ b/agent/ae/ae.go
@@ -142,6 +142,7 @@ FullSync:
 			case <-s.SyncFull.Notif():
 				select {
 				case <-time.After(s.stagger(s.serverUpInterval)):
+					continue FullSync
 				case <-s.ShutdownCh:
 					return
 				}
@@ -149,12 +150,11 @@ FullSync:
 			// retry full sync after some time
 			// todo(fs): why don't we use s.Interval here?
 			case <-time.After(s.retryFailInterval + s.stagger(s.retryFailInterval)):
+				continue FullSync
 
 			case <-s.ShutdownCh:
 				return
 			}
-
-			continue
 		}
 
 		// do partial syncs until it is time for a full sync again