diff --git a/src/com/codebutler/android_websockets/WebSocketClient.java b/src/com/codebutler/android_websockets/WebSocketClient.java
index 84b46b2..137d962 100644
--- a/src/com/codebutler/android_websockets/WebSocketClient.java
+++ b/src/com/codebutler/android_websockets/WebSocketClient.java
@@ -75,8 +75,8 @@ public void run() {
                     int port = (mURI.getPort() != -1) ? mURI.getPort() : ((mURI.getScheme().equals("wss") || mURI.getScheme().equals("https")) ? 443 : 80);
 
                     String path = TextUtils.isEmpty(mURI.getPath()) ? "/" : mURI.getPath();
-                    if (!TextUtils.isEmpty(mURI.getQuery())) {
-                        path += "?" + mURI.getQuery();
+                    if (!TextUtils.isEmpty(mURI.getRawQuery())) {
+                        path += "?" + mURI.getRawQuery();
                     }
 
                     String originScheme = mURI.getScheme().equals("wss") ? "https" : "http";