diff --git a/firestore/watch.go b/firestore/watch.go
index 671ce9e522a..e4ac7fb3ded 100644
--- a/firestore/watch.go
+++ b/firestore/watch.go
@@ -446,8 +446,11 @@ func (s *watchStream) stop() {
 		return
 	}
 	if err != nil {
+		// if an error occurs while closing the stream
 		s.err = err
+		return
 	}
+	// if we close successfully,
 	s.err = io.EOF // normal shutdown
 }