diff --git a/src/com/codebutler/android_websockets/SocketIOClient.java b/src/com/codebutler/android_websockets/SocketIOClient.java
index 8e5ccf9..21e2593 100644
--- a/src/com/codebutler/android_websockets/SocketIOClient.java
+++ b/src/com/codebutler/android_websockets/SocketIOClient.java
@@ -129,7 +129,8 @@ public void onMessage(String message) {
                     int code = Integer.parseInt(parts[0]);
                     switch (code) {
                     case 1:
-                        onConnect();
+                        // connect
+                        mHandler.onConnect();
                         break;
                     case 2:
                         // heartbeat
@@ -239,7 +240,6 @@ public void run() {
                         mClient.send("2:::");
                     }
                 }, mHeartbeat);
-                mHandler.onConnect();
             }
         }, null);
         mClient.connect();