diff --git a/config/nginx.sample.conf b/config/nginx.sample.conf
index e7741c1eb3e..db59d012461 100644
--- a/config/nginx.sample.conf
+++ b/config/nginx.sample.conf
@@ -121,7 +121,7 @@ server {
     }
 
     # cache emojis
-    location ~ /_?emoji.*\.(png|gif|jpg|jpeg)$/ {
+    location ~ /images/emoji/.*\.(png|gif|jpg|jpeg)(\?.*)?$/ {
       expires 1y;
       add_header Cache-Control public,immutable;
     }