diff --git a/actix-files/CHANGES.md b/actix-files/CHANGES.md
index eb66e0e07..004479183 100644
--- a/actix-files/CHANGES.md
+++ b/actix-files/CHANGES.md
@@ -1,6 +1,9 @@
 # Changes
 
 ## Unreleased - 2021-xx-xx
+* For symbolic links, `Content-Disposition` header no longer shows the filename of the original file. [#2156]
+
+[#2156]: https://github.com/actix/actix-web/pull/2156
 
 
 ## 0.6.0-beta.4 - 2021-04-02
diff --git a/actix-files/src/lib.rs b/actix-files/src/lib.rs
index 24b903c04..e9b55e87e 100644
--- a/actix-files/src/lib.rs
+++ b/actix-files/src/lib.rs
@@ -754,4 +754,19 @@ mod tests {
         let res = test::call_service(&srv, req).await;
         assert_eq!(res.status(), StatusCode::OK);
     }
+
+    #[actix_rt::test]
+    async fn test_symlinks() {
+        let srv = test::init_service(App::new().service(Files::new("test", "."))).await;
+
+        let req = TestRequest::get()
+            .uri("/test/tests/symlink-test.png")
+            .to_request();
+        let res = test::call_service(&srv, req).await;
+        assert_eq!(res.status(), StatusCode::OK);
+        assert_eq!(
+            res.headers().get(header::CONTENT_DISPOSITION).unwrap(),
+            "inline; filename=\"symlink-test.png\""
+        );
+    }
 }
diff --git a/actix-files/src/service.rs b/actix-files/src/service.rs
index d2db8503f..dc51ada18 100644
--- a/actix-files/src/service.rs
+++ b/actix-files/src/service.rs
@@ -83,10 +83,10 @@ impl Service<ServiceRequest> for FilesService {
             };
 
         // full file path
-        let path = match self.directory.join(&real_path).canonicalize() {
-            Ok(path) => path,
-            Err(err) => return Box::pin(self.handle_err(err, req)),
-        };
+        let path = self.directory.join(&real_path);
+        if let Err(err) = path.canonicalize() {
+            return Box::pin(self.handle_err(err, req));
+        }
 
         if path.is_dir() {
             if let Some(ref redir_index) = self.index {
diff --git a/actix-files/tests/symlink-test.png b/actix-files/tests/symlink-test.png
new file mode 120000
index 000000000..65c0dcfd6
--- /dev/null
+++ b/actix-files/tests/symlink-test.png
@@ -0,0 +1 @@
+test.png
\ No newline at end of file