diff --git a/.env.example b/.env.example
index 9ef5bf75..6031abe7 100644
--- a/.env.example
+++ b/.env.example
@@ -12,6 +12,7 @@ DB_PASSWORD=secret
 CACHE_DRIVER=file
 SESSION_DRIVER=file
 QUEUE_DRIVER=database
+CACHET_EMOJI=false
 
 MAIL_DRIVER=smtp
 MAIL_HOST=mailtrap.io
diff --git a/config/app.php b/config/app.php
index 17d4c652..556ed61c 100644
--- a/config/app.php
+++ b/config/app.php
@@ -117,7 +117,7 @@ return [
     |
     */
 
-    'providers' => [
+    'providers' => array_filter([
 
         /*
          * Laravel Framework Service Providers...
@@ -149,7 +149,7 @@ return [
         /*
          * Packages Service Providers...
          */
-        'AltThree\Emoji\EmojiServiceProvider',
+        env('CACHET_EMOJI', false) ? 'AltThree\Emoji\EmojiServiceProvider' : null,
         'Barryvdh\Cors\CorsServiceProvider',
         'Fideloper\Proxy\TrustedProxyServiceProvider',
         'GrahamCampbell\Binput\BinputServiceProvider',
@@ -173,7 +173,7 @@ return [
         'CachetHQ\Cachet\Providers\RepositoryServiceProvider',
         'CachetHQ\Cachet\Providers\RouteServiceProvider',
 
-    ],
+    ]),
 
     /*
     |--------------------------------------------------------------------------
@@ -221,8 +221,8 @@ return [
         'Validator' => 'Illuminate\Support\Facades\Validator',
         'View'      => 'Illuminate\Support\Facades\View',
 
-        'Setting' => 'CachetHQ\Cachet\Facades\Setting',
-        'Str'     => 'Illuminate\Support\Str',
+        'Setting'   => 'CachetHQ\Cachet\Facades\Setting',
+        'Str'       => 'Illuminate\Support\Str',
 
     ],