diff --git a/flutter/lib/main.dart b/flutter/lib/main.dart
index 816870984..43069bf79 100644
--- a/flutter/lib/main.dart
+++ b/flutter/lib/main.dart
@@ -172,15 +172,7 @@ void runConnectionManagerScreen() async {
   // initialize window
   WindowOptions windowOptions =
       getHiddenTitleBarWindowOptions(size: const Size(300, 400));
-  await Future.wait([
-    initEnv(kAppTypeMain),
-    windowManager.waitUntilReadyToShow(windowOptions, () async {
-      await windowManager.setAlignment(Alignment.topRight);
-      await windowManager.show();
-      await windowManager.focus();
-      await windowManager.setAlignment(Alignment.topRight); // ensure
-    })
-  ]);
+  await initEnv(kAppTypeMain);
   runApp(GetMaterialApp(
       debugShowCheckedModeBanner: false,
       theme: MyTheme.lightTheme,
@@ -188,6 +180,12 @@ void runConnectionManagerScreen() async {
       themeMode: MyTheme.initialThemeMode(),
       home: const DesktopServerPage(),
       builder: _keepScaleBuilder()));
+  windowManager.waitUntilReadyToShow(windowOptions, () async {
+      await windowManager.setAlignment(Alignment.topRight);
+      await windowManager.show();
+      await windowManager.focus();
+      await windowManager.setAlignment(Alignment.topRight); // ensure
+    });
 }
 
 WindowOptions getHiddenTitleBarWindowOptions({Size? size}) {
diff --git a/flutter/lib/models/native_model.dart b/flutter/lib/models/native_model.dart
index 964979731..666116d78 100644
--- a/flutter/lib/models/native_model.dart
+++ b/flutter/lib/models/native_model.dart
@@ -136,9 +136,15 @@ class PlatformFFI {
         name = linuxInfo.name;
         id = linuxInfo.machineId ?? linuxInfo.id;
       } else if (Platform.isWindows) {
-        WindowsDeviceInfo winInfo = await deviceInfo.windowsInfo;
-        name = winInfo.computerName;
-        id = winInfo.computerName;
+        try {
+          WindowsDeviceInfo winInfo = await deviceInfo.windowsInfo;
+          name = winInfo.computerName;
+          id = winInfo.computerName;
+        } catch (e) {
+          debugPrint("$e");
+          name = "unknown";
+          id = "unknown";
+        }
       } else if (Platform.isMacOS) {
         MacOsDeviceInfo macOsInfo = await deviceInfo.macOsInfo;
         name = macOsInfo.computerName;
diff --git a/flutter/pubspec.yaml b/flutter/pubspec.yaml
index 1cb72677c..02621ed66 100644
--- a/flutter/pubspec.yaml
+++ b/flutter/pubspec.yaml
@@ -80,7 +80,7 @@ dependencies:
     rxdart: ^0.27.5
 
 dev_dependencies:
-    icons_launcher: ^2.0.5
+    icons_launcher: ^2.0.4
     #flutter_test:
         #sdk: flutter
     build_runner: ^2.1.11