diff --git a/lib/src/model/version.dart b/lib/src/model/version.dart
index 66215c2..256af44 100644
--- a/lib/src/model/version.dart
+++ b/lib/src/model/version.dart
@@ -1,5 +1,5 @@
 class PlatformVersionMatcher {
-  static const int minPlatformVersionInt = 3600;
+  static const int minPlatformVersionInt = 3620;
 
   static bool isSupportedPlatformVersion(PlatformVersion platformVersion) {
     try {
diff --git a/lib/src/service/telemetry_websocket_service.dart b/lib/src/service/telemetry_websocket_service.dart
index 0dd73c2..713665a 100644
--- a/lib/src/service/telemetry_websocket_service.dart
+++ b/lib/src/service/telemetry_websocket_service.dart
@@ -189,6 +189,10 @@ class TelemetryWebsocketService implements TelemetryService {
     try {
       var channel = WebSocketChannel.connect(_telemetryUri);
       _sink = channel.sink;
+      channel.ready.then((value) => _onOpen(token), onError: ((e, stackTrace) {
+        _onError(e);
+        _onClose(channel);
+      }));
       channel.stream.listen((event) {
         _onMessage(event);
       }, onDone: () {
@@ -196,8 +200,8 @@ class TelemetryWebsocketService implements TelemetryService {
       }, onError: (e) {
         _onError(e);
       });
-      _onOpen(token);
     } catch (e) {
+      _onError(e);
       _onClose();
     }
   }