diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/websocket/WebSocketConnection.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/websocket/WebSocketConnection.java
index b43f78637f..61df211a07 100644
--- a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/websocket/WebSocketConnection.java
+++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/websocket/WebSocketConnection.java
@@ -208,7 +208,7 @@ public class WebSocketConnection extends WebSocketListener {
 
     return single.subscribeOn(Schedulers.io())
                  .observeOn(Schedulers.io())
-                 .timeout(10, TimeUnit.SECONDS);
+                 .timeout(10, TimeUnit.SECONDS, Schedulers.io());
   }
 
   public synchronized void sendResponse(WebSocketResponseMessage response) throws IOException {