diff --git a/lib/config/routes.dart b/lib/config/routes.dart
index 1002989b..338ded0a 100644
--- a/lib/config/routes.dart
+++ b/lib/config/routes.dart
@@ -161,7 +161,10 @@ class FluffyRoutes {
               case 'emotes':
                 return ViewData(
                   leftView: (_) => Settings(),
-                  mainView: (_) => EmotesSettings(room: settings.arguments),
+                  mainView: (_) => EmotesSettings(
+                    room: (settings.arguments as Map)['room'],
+                    stateKey: (settings.arguments as Map)['stateKey'],
+                  ),
                 );
               case 'ignore':
                 return ViewData(
diff --git a/lib/views/chat_details.dart b/lib/views/chat_details.dart
index ba241eac..86dcf616 100644
--- a/lib/views/chat_details.dart
+++ b/lib/views/chat_details.dart
@@ -322,8 +322,9 @@ class _ChatDetailsState extends State<ChatDetails> {
                                 await AdaptivePageLayout.of(context)
                                     .pushNamed('/rooms/${room.id}/emotes');
                               } else {
-                                await AdaptivePageLayout.of(context)
-                                    .pushNamed('/settings/emotes');
+                                await AdaptivePageLayout.of(context).pushNamed(
+                                    '/settings/emotes',
+                                    arguments: {'room': room});
                               }
                             },
                           ),
diff --git a/lib/views/settings_multiple_emotes.dart b/lib/views/settings_multiple_emotes.dart
index 3a19218b..7e94c65d 100644
--- a/lib/views/settings_multiple_emotes.dart
+++ b/lib/views/settings_multiple_emotes.dart
@@ -45,7 +45,10 @@ class MultipleEmotesSettings extends StatelessWidget {
                   onTap: () async {
                     await AdaptivePageLayout.of(context).pushNamed(
                       '/settings/emotes',
-                      arguments: room,
+                      arguments: {
+                        'room': room,
+                        'stateKey': keys[i],
+                      },
                     );
                   },
                 );