diff --git a/src/csharp/Grpc.Core/Server.cs b/src/csharp/Grpc.Core/Server.cs
index 961b911fbb17eaf13c3baf76a488551c172778c7..63c1d9cd00f3047dc6129813bd3c70a1af60c718 100644
--- a/src/csharp/Grpc.Core/Server.cs
+++ b/src/csharp/Grpc.Core/Server.cs
@@ -344,8 +344,7 @@ namespace Grpc.Core
             {
                 Logger.Warning(e, "Exception while handling RPC.");
             }
-
-            if (continuation != null)
+            finally
             {
                 continuation();
             }