diff --git a/go/vt/discovery/keyspace_events.go b/go/vt/discovery/keyspace_events.go
index 9fa457c1589..78697de22b1 100644
--- a/go/vt/discovery/keyspace_events.go
+++ b/go/vt/discovery/keyspace_events.go
@@ -685,7 +685,10 @@ func (kew *KeyspaceEventWatcher) PrimaryIsNotServing(ctx context.Context, target
 	if state, ok := ks.shards[target.Shard]; ok {
 		// If the primary tablet was present then externallyReparented will be non-zero and
 		// currentPrimary will be not nil.
-		return state.currentPrimary, !state.serving && !ks.consistent && state.externallyReparented != 0 && state.currentPrimary != nil
+
+		// serving := state.serving && ks.consistent && state.externallyReparented != 0 && state.currentPrimary != nil
+		// notServing := !state.serving || !ks.consistent || state.externallyReparented == 0 || state.currentPrimary == nil
+		return state.currentPrimary, !state.serving || !ks.consistent || state.externallyReparented == 0 || state.currentPrimary == nil
 	}
 	return nil, false
 }