diff --git a/config/nginx.sample.conf b/config/nginx.sample.conf
index f13a987a125..112614197c1 100644
--- a/config/nginx.sample.conf
+++ b/config/nginx.sample.conf
@@ -87,6 +87,12 @@ server {
       expires 1y;
       add_header Cache-Control public;
     }
+    
+    # cache emojis
+    location ~ /_?emoji/ {
+      expires 1y;
+      add_header Cache-Control public;
+    }
 
     location ~ ^/uploads/ {