diff --git a/src/python/grpcio/grpc/_server.py b/src/python/grpcio/grpc/_server.py
index c8af57c0806..98b20f77d6e 100644
--- a/src/python/grpcio/grpc/_server.py
+++ b/src/python/grpcio/grpc/_server.py
@@ -518,6 +518,7 @@ class _RequestIterator(object):
         elif (
             self._state.request is None
             and _RECEIVE_MESSAGE_TOKEN not in self._state.due
+            and _RECEIVE_CLOSE_ON_SERVER_TOKEN not in self._state.due
         ):
             raise StopIteration()
         else: