diff --git a/app/javascript/mastodon/utils/environment.ts b/app/javascript/mastodon/utils/environment.ts
index 457da5c7367..c5fe46bc931 100644
--- a/app/javascript/mastodon/utils/environment.ts
+++ b/app/javascript/mastodon/utils/environment.ts
@@ -19,5 +19,12 @@ export function isFeatureEnabled(feature: Features) {
 }
 
 export function isModernEmojiEnabled() {
-  return isFeatureEnabled('modern_emojis') && isDevelopment();
+  try {
+    return (
+      isFeatureEnabled('modern_emojis') &&
+      localStorage.getItem('experiments')?.split(',').includes('modern_emojis')
+    );
+  } catch {
+    return false;
+  }
 }