diff --git a/pkg/server/peer.go b/pkg/server/peer.go
index ba65f21d..804b7850 100644
--- a/pkg/server/peer.go
+++ b/pkg/server/peer.go
@@ -206,7 +206,7 @@ func (peer *peer) recvedAllEOR() bool {
 	peer.fsm.lock.RLock()
 	defer peer.fsm.lock.RUnlock()
 	for _, a := range peer.fsm.pConf.AfiSafis {
-		if s := a.MpGracefulRestart.State; s.Enabled && !s.EndOfRibReceived {
+		if s := a.MpGracefulRestart.State; s.Enabled && s.Received && !s.EndOfRibReceived {
 			return false
 		}
 	}