diff --git a/SocketIO.h b/SocketIO.h
index 2fbb12e..ff136bf 100755
--- a/SocketIO.h
+++ b/SocketIO.h
@@ -88,6 +88,8 @@ typedef enum {
     
     // get all arguments from ack? (https://github.com/pkyeck/socket.IO-objc/pull/85)
     BOOL _returnAllDataFromAck;
+    
+    BOOL _useSocket;
 }
 
 @property (nonatomic, readonly) NSString *host;
@@ -119,4 +121,4 @@ typedef enum {
 
 - (void) setResourceName:(NSString *)name;
 
-@end
\ No newline at end of file
+@end
diff --git a/SocketIO.m b/SocketIO.m
index 61ff67a..aff1b83 100755
--- a/SocketIO.m
+++ b/SocketIO.m
@@ -90,6 +90,7 @@ - (id) initWithDelegate:(id<SocketIODelegate>)delegate
         _ackCount = 0;
         _acks = [[NSMutableDictionary alloc] init];
         _returnAllDataFromAck = NO;
+        _useSocket = YES;
     }
     return self;
 }
@@ -630,7 +631,8 @@ - (void) onDisconnect:(NSError *)error
         _transport.delegate = nil;
         [_transport close];
     }
-    
+    if ([_transport isKindOfClass:NSClassFromString(@"SocketIOTransportWebsocket")] && wasConnecting && !wasConnected)
+        _useSocket = NO;
     if ((wasConnected || wasConnecting)) {
         if ([_delegate respondsToSelector:@selector(socketIODidDisconnect:disconnectedWithError:)]) {
             [_delegate socketIODidDisconnect:self disconnectedWithError:error];
@@ -754,13 +756,14 @@ - (void) connectionDidFinishLoading:(NSURLConnection *)connection
             xhrTransportClass = NSClassFromString(@"SocketIOTransportXHR");
         }
         
-        if (webSocketTransportClass != nil && [transports indexOfObject:@"websocket"] != NSNotFound) {
+        if (webSocketTransportClass != nil && [transports indexOfObject:@"websocket"] != NSNotFound && _useSocket) {
             DEBUGLOG(@"websocket supported -> using it now");
             _transport = [[webSocketTransportClass alloc] initWithDelegate:self];
         }
         else if (xhrTransportClass != nil && [transports indexOfObject:@"xhr-polling"] != NSNotFound) {
             DEBUGLOG(@"xhr polling supported -> using it now");
             _transport = [[xhrTransportClass alloc] initWithDelegate:self];
+            _useSocket = YES;
         }
         else {
             DEBUGLOG(@"no transport found that is supported :( -> fail");