diff --git a/config/nginx.sample.conf b/config/nginx.sample.conf
index 930b2c161b2..7a79b2d7847 100644
--- a/config/nginx.sample.conf
+++ b/config/nginx.sample.conf
@@ -80,11 +80,9 @@ server {
     internal;
   }
 
-  # return a cheap 404 for favicon cause lots of browsers like asking for it
-  # view source and old browsers, this bypasses the rails stack at the expense of
-  # having an ugly 404 page
+  # bypass rails stack with a cheap 204 for favicon.ico requests
   location /favicon.ico {
-    return 404;
+    return 204;
   }
 
   location / {