diff --git a/lib/main.dart b/lib/main.dart
index d8e0eb90..ea4ee983 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -227,6 +227,7 @@ class MyApp extends StatelessWidget {
               refreshBackgroundColor: darkColorScheme.onSecondary,
             ),
           ),
+          themeMode: GStorage.themeMode,
           localizationsDelegates: const [
             GlobalCupertinoLocalizations.delegate,
             GlobalMaterialLocalizations.delegate,
diff --git a/lib/utils/storage.dart b/lib/utils/storage.dart
index f109255d..3808d238 100644
--- a/lib/utils/storage.dart
+++ b/lib/utils/storage.dart
@@ -2,6 +2,7 @@ import 'dart:convert';
 import 'dart:io';
 import 'dart:ui';
 import 'package:PiliPalaX/models/common/theme_type.dart';
+import 'package:flutter/material.dart';
 import 'package:hive_flutter/hive_flutter.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:PiliPalaX/models/model_owner.dart';
@@ -16,6 +17,19 @@ class GStorage {
   static late final Box<dynamic> setting;
   static late final Box<dynamic> video;
 
+  static ThemeMode get themeMode {
+    switch (setting.get(SettingBoxKey.themeMode,
+        defaultValue: ThemeType.system.code)) {
+      case 0:
+        return ThemeMode.light;
+      case 1:
+        return ThemeMode.dark;
+      case 2:
+      default:
+        return ThemeMode.system;
+    }
+  }
+
   static Brightness get brightness {
     switch (setting.get(SettingBoxKey.themeMode,
         defaultValue: ThemeType.system.code)) {