diff --git a/src/SignalR/clients/java/signalr/core/build.gradle b/src/SignalR/clients/java/signalr/core/build.gradle
index 5465c4a65e63..645875c630ee 100644
--- a/src/SignalR/clients/java/signalr/core/build.gradle
+++ b/src/SignalR/clients/java/signalr/core/build.gradle
@@ -8,7 +8,7 @@ group 'com.microsoft.signalr'
 dependencies {
     implementation 'com.google.code.gson:gson:2.8.5'
     implementation 'com.squareup.okhttp3:okhttp:3.11.0'
-    api 'io.reactivex.rxjava2:rxjava:2.2.3'
+    api 'io.reactivex.rxjava3:rxjava:3.0.11'
     implementation 'org.slf4j:slf4j-api:1.7.25'
 }
 
diff --git a/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/DefaultHttpClient.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/DefaultHttpClient.java
index f8ddc42c6b8e..2a97bada9e12 100644
--- a/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/DefaultHttpClient.java
+++ b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/DefaultHttpClient.java
@@ -13,8 +13,8 @@
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
-import io.reactivex.Single;
-import io.reactivex.subjects.SingleSubject;
+import io.reactivex.rxjava3.core.Single;
+import io.reactivex.rxjava3.subjects.SingleSubject;
 import okhttp3.*;
 import okio.ByteString;
 
diff --git a/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HttpClient.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HttpClient.java
index 9a5ecf352be5..96a9c42d50ed 100644
--- a/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HttpClient.java
+++ b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HttpClient.java
@@ -7,7 +7,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import io.reactivex.Single;
+import io.reactivex.rxjava3.core.Single;
 
 class HttpRequest {
     private String method;
diff --git a/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HttpHubConnectionBuilder.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HttpHubConnectionBuilder.java
index 09a4c04eddd1..1699ccd88301 100644
--- a/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HttpHubConnectionBuilder.java
+++ b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HttpHubConnectionBuilder.java
@@ -6,7 +6,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import io.reactivex.Single;
+import io.reactivex.rxjava3.core.Single;
 import okhttp3.OkHttpClient;
 
 /**
diff --git a/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HubConnection.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HubConnection.java
index b291bee21fd8..a382728032e8 100644
--- a/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HubConnection.java
+++ b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HubConnection.java
@@ -19,10 +19,10 @@
 
 import com.google.gson.stream.JsonReader;
 
-import io.reactivex.Completable;
-import io.reactivex.Observable;
-import io.reactivex.Single;
-import io.reactivex.subjects.*;
+import io.reactivex.rxjava3.core.Completable;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Single;
+import io.reactivex.rxjava3.subjects.*;
 import okhttp3.OkHttpClient;
 
 /**
diff --git a/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/InvocationRequest.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/InvocationRequest.java
index 7c57d6177c1c..79da00347cad 100644
--- a/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/InvocationRequest.java
+++ b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/InvocationRequest.java
@@ -6,8 +6,8 @@
 import java.lang.reflect.Type;
 import java.util.concurrent.CancellationException;
 
-import io.reactivex.subjects.ReplaySubject;
-import io.reactivex.subjects.Subject;
+import io.reactivex.rxjava3.subjects.ReplaySubject;
+import io.reactivex.rxjava3.subjects.Subject;
 
 class InvocationRequest {
     private final Type returnType;
diff --git a/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/LongPollingTransport.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/LongPollingTransport.java
index d52d5edb3880..3e3e643b389b 100644
--- a/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/LongPollingTransport.java
+++ b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/LongPollingTransport.java
@@ -13,9 +13,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import io.reactivex.Completable;
-import io.reactivex.Single;
-import io.reactivex.subjects.CompletableSubject;
+import io.reactivex.rxjava3.core.Completable;
+import io.reactivex.rxjava3.core.Single;
+import io.reactivex.rxjava3.subjects.CompletableSubject;
 
 class LongPollingTransport implements Transport {
     private OnReceiveCallBack onReceiveCallBack;
diff --git a/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/OkHttpWebSocketWrapper.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/OkHttpWebSocketWrapper.java
index 85c904a7dc26..839e160f086e 100644
--- a/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/OkHttpWebSocketWrapper.java
+++ b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/OkHttpWebSocketWrapper.java
@@ -11,8 +11,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import io.reactivex.Completable;
-import io.reactivex.subjects.CompletableSubject;
+import io.reactivex.rxjava3.core.Completable;
+import io.reactivex.rxjava3.subjects.CompletableSubject;
 import okhttp3.Headers;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
diff --git a/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Transport.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Transport.java
index ab0d547898bc..d0d3167b2d22 100644
--- a/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Transport.java
+++ b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Transport.java
@@ -5,7 +5,7 @@
 
 import java.nio.ByteBuffer;
 
-import io.reactivex.Completable;
+import io.reactivex.rxjava3.core.Completable;
 
 interface Transport {
     Completable start(String url);
diff --git a/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/WebSocketTransport.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/WebSocketTransport.java
index 25543221ca86..f23ba26321ef 100644
--- a/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/WebSocketTransport.java
+++ b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/WebSocketTransport.java
@@ -9,7 +9,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import io.reactivex.Completable;
+import io.reactivex.rxjava3.core.Completable;
 
 class WebSocketTransport implements Transport {
     private WebSocketWrapper webSocketClient;
diff --git a/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/WebSocketWrapper.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/WebSocketWrapper.java
index 773f40ab0e07..b1467550cd46 100644
--- a/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/WebSocketWrapper.java
+++ b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/WebSocketWrapper.java
@@ -5,7 +5,7 @@
 
 import java.nio.ByteBuffer;
 
-import io.reactivex.Completable;
+import io.reactivex.rxjava3.core.Completable;
 
 abstract class WebSocketWrapper {
     public abstract Completable start();
diff --git a/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/HubConnectionTest.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/HubConnectionTest.java
index 3b694570e7ef..96b76470e258 100644
--- a/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/HubConnectionTest.java
+++ b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/HubConnectionTest.java
@@ -19,15 +19,15 @@
 import org.junit.jupiter.api.Test;
 
 import ch.qos.logback.classic.spi.ILoggingEvent;
-import io.reactivex.Completable;
-import io.reactivex.Observable;
-import io.reactivex.Single;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subjects.CompletableSubject;
-import io.reactivex.subjects.PublishSubject;
-import io.reactivex.subjects.ReplaySubject;
-import io.reactivex.subjects.SingleSubject;
+import io.reactivex.rxjava3.core.Completable;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Single;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subjects.CompletableSubject;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.subjects.ReplaySubject;
+import io.reactivex.rxjava3.subjects.SingleSubject;
 
 class HubConnectionTest {
     private static final String RECORD_SEPARATOR = "\u001e";
@@ -1423,7 +1423,7 @@ public void invokeNoReturnValueWaitsForCompletion() {
 
         mockTransport.receiveMessage("{\"type\":3,\"invocationId\":\"1\"}" + RECORD_SEPARATOR);
 
-        assertNull(result.timeout(30, TimeUnit.SECONDS).blockingGet());
+        assertTrue(result.blockingAwait(30, TimeUnit.SECONDS));
         assertTrue(done.get());
     }
 
@@ -1445,7 +1445,7 @@ public void invokeNoReturnValueWaitsForCompletionWithMessagePack() {
 
         mockTransport.receiveMessage(ByteBuffer.wrap(new byte[] { 0x06, (byte) 0x94, 0x03, (byte) 0x80, (byte) 0xA1, 0x31, 0x02 }));
 
-        assertNull(result.timeout(30, TimeUnit.SECONDS).blockingGet());
+        assertTrue(result.blockingAwait(30, TimeUnit.SECONDS));
         assertTrue(done.get());
     }
 
@@ -1466,7 +1466,7 @@ public void invokeCompletedByCompletionMessageWithResult() {
 
         mockTransport.receiveMessage("{\"type\":3,\"invocationId\":\"1\",\"result\":42}" + RECORD_SEPARATOR);
 
-        assertNull(result.timeout(30, TimeUnit.SECONDS).blockingGet());
+        assertTrue(result.blockingAwait(30, TimeUnit.SECONDS));
         assertTrue(done.get());
     }
 
@@ -1488,7 +1488,7 @@ public void invokeCompletedByCompletionMessageWithResultWithMessagePack() {
 
         mockTransport.receiveMessage(ByteBuffer.wrap(new byte[] { 0x07, (byte) 0x95, 0x03, (byte) 0x80, (byte) 0xA1, 0x31, 0x03, 0x2A }));
 
-        assertNull(result.timeout(30, TimeUnit.SECONDS).blockingGet());
+        assertTrue(result.blockingAwait(30, TimeUnit.SECONDS));
         assertTrue(done.get());
     }
 
@@ -1529,7 +1529,7 @@ public void invokeNoReturnValueHandlesError() {
 
         mockTransport.receiveMessage("{\"type\":3,\"invocationId\":\"1\",\"error\":\"There was an error\"}" + RECORD_SEPARATOR);
 
-        result.timeout(30, TimeUnit.SECONDS).blockingGet();
+        assertTrue(result.onErrorComplete().blockingAwait(30, TimeUnit.SECONDS));
 
         AtomicReference<String> errorMessage = new AtomicReference<>();
         result.doOnError(error -> {
@@ -1559,7 +1559,7 @@ public void invokeNoReturnValueHandlesErrorWithMessagePack() {
                 0x72, 0x65, 0x20, 0x77, 0x61, 0x73, 0x20, 0x61, 0x6E, 0x20, 0x65, 0x72, 0x72, 0x6F, 0x72 };
         mockTransport.receiveMessage(ByteBuffer.wrap(completionMessageErrorBytes));
 
-        result.timeout(30, TimeUnit.SECONDS).blockingGet();
+        assertTrue(result.onErrorComplete().blockingAwait(30, TimeUnit.SECONDS));
 
         AtomicReference<String> errorMessage = new AtomicReference<>();
         result.doOnError(error -> {
@@ -3885,6 +3885,6 @@ public void hubConnectionCloseCallsStop() {
             assertEquals(HubConnectionState.CONNECTED, hubConnection.getConnectionState());
         }
 
-        close.timeout(30, TimeUnit.SECONDS).blockingGet();
+        assertTrue(close.blockingAwait(30, TimeUnit.SECONDS));
     }
 }
diff --git a/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/LongPollingTransportTest.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/LongPollingTransportTest.java
index f089587cab0b..dbe25a562144 100644
--- a/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/LongPollingTransportTest.java
+++ b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/LongPollingTransportTest.java
@@ -15,8 +15,8 @@
 
 import org.junit.jupiter.api.Test;
 
-import io.reactivex.Single;
-import io.reactivex.subjects.CompletableSubject;
+import io.reactivex.rxjava3.core.Single;
+import io.reactivex.rxjava3.subjects.CompletableSubject;
 
 public class LongPollingTransportTest {
 
diff --git a/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/MockTransport.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/MockTransport.java
index 919ba49e7443..d76cac7f2b34 100644
--- a/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/MockTransport.java
+++ b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/MockTransport.java
@@ -6,9 +6,9 @@
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 
-import io.reactivex.Completable;
-import io.reactivex.subjects.CompletableSubject;
-import io.reactivex.subjects.SingleSubject;
+import io.reactivex.rxjava3.core.Completable;
+import io.reactivex.rxjava3.subjects.CompletableSubject;
+import io.reactivex.rxjava3.subjects.SingleSubject;
 
 class MockTransport implements Transport {
     private OnReceiveCallBack onReceiveCallBack;
diff --git a/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/TestHttpClient.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/TestHttpClient.java
index b257076e915c..81f4d730a3d7 100644
--- a/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/TestHttpClient.java
+++ b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/TestHttpClient.java
@@ -8,7 +8,7 @@
 import java.util.List;
 import java.util.Map;
 
-import io.reactivex.Single;
+import io.reactivex.rxjava3.core.Single;
 
 class TestHttpClient extends HttpClient {
     private TestHttpRequestHandler handler;
diff --git a/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/WebSocketTransportTest.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/WebSocketTransportTest.java
index 62ec1e95d7bc..31ccc10b0846 100644
--- a/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/WebSocketTransportTest.java
+++ b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/WebSocketTransportTest.java
@@ -13,8 +13,8 @@
 
 import org.junit.jupiter.api.Test;
 
-import io.reactivex.Completable;
-import io.reactivex.Single;
+import io.reactivex.rxjava3.core.Completable;
+import io.reactivex.rxjava3.core.Single;
 
 class WebSocketTransportTest {
     @Test