diff --git a/lib/pages/settings_emotes/settings_emotes.dart b/lib/pages/settings_emotes/settings_emotes.dart
index 95ec753e9..4b50975da 100644
--- a/lib/pages/settings_emotes/settings_emotes.dart
+++ b/lib/pages/settings_emotes/settings_emotes.dart
@@ -45,7 +45,7 @@ class EmotesSettingsController extends State<EmotesSettings> {
   @override
   void initState() {
     super.initState();
-    stateKey = packKeys?.first;
+    stateKey = packKeys?.firstOrNull;
   }
 
   void setStateKey(String key) {
diff --git a/lib/pages/settings_emotes/settings_emotes_view.dart b/lib/pages/settings_emotes/settings_emotes_view.dart
index cc2111b97..31b61b102 100644
--- a/lib/pages/settings_emotes/settings_emotes_view.dart
+++ b/lib/pages/settings_emotes/settings_emotes_view.dart
@@ -71,7 +71,7 @@ class EmotesSettingsView extends StatelessWidget {
               ],
             ),
         ],
-        bottom: packKeys == null
+        bottom: packKeys == null || packKeys.isEmpty
             ? null
             : PreferredSize(
                 preferredSize: const Size.fromHeight(48),