diff --git a/Runtime/Scripts/Core/Room.cs b/Runtime/Scripts/Core/Room.cs
index eec304c3..7c399017 100644
--- a/Runtime/Scripts/Core/Room.cs
+++ b/Runtime/Scripts/Core/Room.cs
@@ -102,6 +102,7 @@ public Proto.RoomOptions ToProto()
             proto.AdaptiveStream = AdaptiveStream;
             proto.JoinRetries = JoinRetries;
             proto.RtcConfig = RtcConfig?.ToProto();
+#pragma warning disable CS0612 // Type or member is obsolete
             proto.E2Ee = E2EE?.ToProto();
 
             return proto;
diff --git a/Tests/PlayMode/RpcTests.cs b/Tests/PlayMode/RpcTests.cs
index 44a5c4aa..cd8c630c 100644
--- a/Tests/PlayMode/RpcTests.cs
+++ b/Tests/PlayMode/RpcTests.cs
@@ -27,9 +27,9 @@ public IEnumerator RegisterRpcMethod_AndPerformRpc_ReturnsResponse()
             yield return context.ConnectAll();
             Assert.IsNull(context.ConnectionError, context.ConnectionError);
 
-            context.Rooms[1].LocalParticipant.RegisterRpcMethod("echo", async (data) =>
+            context.Rooms[1].LocalParticipant.RegisterRpcMethod("echo", (data) =>
             {
-                return $"echo:{data.Payload}";
+                return Task.FromResult($"echo:{data.Payload}");
             });
 
             var rpcInstruction = context.Rooms[0].LocalParticipant.PerformRpc(new PerformRpcParams
@@ -58,9 +58,9 @@ public IEnumerator PerformRpc_HandlerThrowsRpcError_PropagatesError()
             yield return context.ConnectAll();
             Assert.IsNull(context.ConnectionError, context.ConnectionError);
 
-            context.Rooms[1].LocalParticipant.RegisterRpcMethod("throw-rpc", async (data) =>
+            context.Rooms[1].LocalParticipant.RegisterRpcMethod("throw-rpc", (data) =>
             {
-                throw new RpcError(42, "custom error", "custom data");
+                return Task.FromException<string>(new RpcError(42, "custom error", "custom data"));
             });
 
             var rpcInstruction = context.Rooms[0].LocalParticipant.PerformRpc(new PerformRpcParams
@@ -90,9 +90,9 @@ public IEnumerator PerformRpc_HandlerThrowsGenericException_ReturnsApplicationEr
             yield return context.ConnectAll();
             Assert.IsNull(context.ConnectionError, context.ConnectionError);
 
-            context.Rooms[1].LocalParticipant.RegisterRpcMethod("throw-generic", async (data) =>
+            context.Rooms[1].LocalParticipant.RegisterRpcMethod("throw-generic", (data) =>
             {
-                throw new InvalidOperationException("something went wrong");
+                return Task.FromException<string>(new InvalidOperationException("something went wrong"));
             });
 
             var rpcInstruction = context.Rooms[0].LocalParticipant.PerformRpc(new PerformRpcParams
@@ -147,9 +147,9 @@ public IEnumerator UnregisterRpcMethod_ThenPerformRpc_ReturnsUnsupportedMethod()
             yield return context.ConnectAll();
             Assert.IsNull(context.ConnectionError, context.ConnectionError);
 
-            context.Rooms[1].LocalParticipant.RegisterRpcMethod("unreg-test", async (data) =>
+            context.Rooms[1].LocalParticipant.RegisterRpcMethod("unreg-test", (data) =>
             {
-                return "should not reach here";
+                return Task.FromResult("should not reach here");
             });
             context.Rooms[1].LocalParticipant.UnregisterRpcMethod("unreg-test");