diff --git a/src/Serval.Shared/Controllers/OperationCancelledExceptionFilter.cs b/src/Serval.Shared/Controllers/OperationCancelledExceptionFilter.cs
index 82b40c3e..72552494 100644
--- a/src/Serval.Shared/Controllers/OperationCancelledExceptionFilter.cs
+++ b/src/Serval.Shared/Controllers/OperationCancelledExceptionFilter.cs
@@ -11,7 +11,10 @@ public OperationCancelledExceptionFilter(ILoggerFactory loggerFactory)
 
     public override void OnException(ExceptionContext context)
     {
-        if (context.Exception is OperationCanceledException)
+        if (
+            context.Exception is OperationCanceledException
+            || context.Exception is RpcException rpcEx && rpcEx.StatusCode == StatusCode.Cancelled
+        )
         {
             _logger.LogInformation("Request was cancelled");
             context.ExceptionHandled = true;