diff --git a/config/markdown.php b/config/markdown.php
index 5b791b07..16e72db8 100644
--- a/config/markdown.php
+++ b/config/markdown.php
@@ -39,9 +39,7 @@ return [
     |
     */
 
-    'extensions' => [
-        'AltThree\Emoji\EmojiExtension',
-    ],
+    'extensions' => env('CACHET_EMOJI', false) ? ['AltThree\Emoji\EmojiExtension'] : [],
 
     /*
     |--------------------------------------------------------------------------