diff --git a/Common/src/Pollster/Pollster.cs b/Common/src/Pollster/Pollster.cs
index 0b98ed61b..fbc027a83 100644
--- a/Common/src/Pollster/Pollster.cs
+++ b/Common/src/Pollster/Pollster.cs
@@ -401,7 +401,7 @@ await taskHandler.DisposeAsync()
             }
           }
         }
-        catch (RpcException e) when (e.StatusCode == StatusCode.Unavailable)
+        catch (RpcException e) when (TaskHandler.IsStatusFatal(e.StatusCode))
         {
           // This exception should stop pollster
           healthCheckFailedResult_ = HealthCheckResult.Unhealthy("Worker unavailable",