diff --git a/core/lib/src/fs/server.rs b/core/lib/src/fs/server.rs
index 6061256896..a2de4535ca 100644
--- a/core/lib/src/fs/server.rs
+++ b/core/lib/src/fs/server.rs
@@ -238,7 +238,10 @@ impl Handler for FileServer {
                 index.respond_to(req).or_forward((data, Status::NotFound))
             },
             Some(mut p) => {
-                let check_compressed = options.contains(Options::CheckCompressed);
+                let gzip_accepted = req.headers().get("Accept-Encoding")
+                    .find(|value| value.contains("gzip"))
+                    .is_some();
+                let check_compressed = gzip_accepted && options.contains(Options::CheckCompressed);
                 if check_compressed {
                     if let Some(file) = p.file_name() {
                         let mut compressed = file.to_os_string();