diff --git a/watch/plan.go b/watch/plan.go
index 6813b59735..8e4fd5e11a 100644
--- a/watch/plan.go
+++ b/watch/plan.go
@@ -86,6 +86,9 @@ OUTER:
 		if oldIndex != 0 && reflect.DeepEqual(p.lastResult, result) {
 			continue
 		}
+		if p.lastIndex < oldIndex {
+			p.lastIndex = 0
+		}
 
 		// Handle the updated result
 		p.lastResult = result