diff --git a/android/app/build.gradle b/android/app/build.gradle
index 24d927b25..cc4209010 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -33,7 +33,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
     compileSdkVersion 30
-     ndkVersion '22.1.7171670' // * 仅个人使用 存在多版本NDK无法自动选择 需要使用此配置指定NDK版本 [CSF]
+    ndkVersion '22.1.7171670' // * 仅个人使用 存在多版本NDK无法自动选择 需要使用此配置指定NDK版本 [CSF]
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }
diff --git a/lib/main.dart b/lib/main.dart
index 32af66665..c16780ca2 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -16,25 +16,25 @@ class App extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final analytics = FirebaseAnalytics();
-    return ChangeNotifierProvider.value(
-        value: FFI.ffiModel,
-        child: ChangeNotifierProvider.value(
-            value: FFI.imageModel,
-            child: ChangeNotifierProvider.value(
-                value: FFI.cursorModel,
-                child: ChangeNotifierProvider.value(
-                    value: FFI.canvasModel,
-                    child: MaterialApp(
-                      debugShowCheckedModeBanner: false,
-                      title: 'RustDesk',
-                      theme: ThemeData(
-                        primarySwatch: Colors.blue,
-                        visualDensity: VisualDensity.adaptivePlatformDensity,
-                      ),
-                      home: HomePage(title: 'RustDesk'),
-                      navigatorObservers: [
-                        FirebaseAnalyticsObserver(analytics: analytics),
-                      ],
-                    )))));
+    return MultiProvider(
+      providers: [
+        ChangeNotifierProvider.value(value: FFI.ffiModel),
+        ChangeNotifierProvider.value(value: FFI.imageModel),
+        ChangeNotifierProvider.value(value: FFI.cursorModel),
+        ChangeNotifierProvider.value(value: FFI.canvasModel),
+      ],
+      child: MaterialApp(
+        debugShowCheckedModeBanner: false,
+        title: 'RustDesk',
+        theme: ThemeData(
+          primarySwatch: Colors.blue,
+          visualDensity: VisualDensity.adaptivePlatformDensity,
+        ),
+        home: HomePage(title: 'RustDesk'),
+        navigatorObservers: [
+          FirebaseAnalyticsObserver(analytics: analytics),
+        ],
+      ),
+    );
   }
 }