diff --git a/src/Microsoft.AspNetCore.SignalR/RpcEndpoint.cs b/src/Microsoft.AspNetCore.SignalR/RpcEndpoint.cs
index a35b1b87e5..bf501c4193 100644
--- a/src/Microsoft.AspNetCore.SignalR/RpcEndpoint.cs
+++ b/src/Microsoft.AspNetCore.SignalR/RpcEndpoint.cs
@@ -144,8 +144,11 @@ namespace Microsoft.AspNetCore.SignalR
                             if (resultTask != null)
                             {
                                 await resultTask;
-                                var property = resultTask.GetType().GetProperty("Result");
-                                invocationResult.Result = property?.GetValue(resultTask);
+                                if (methodInfo.ReturnType.GetTypeInfo().IsGenericType)
+                                {
+                                    var property = resultTask.GetType().GetProperty("Result");
+                                    invocationResult.Result = property?.GetValue(resultTask);
+                                }
                             }
                             else
                             {