diff --git a/CHANGELOG.md b/CHANGELOG.md
index b3d4690..8b173bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # [master][]
 
 * Your contribution here!
+* [#200](https://github.com/capistrano/rails/pull/200): Don't link public/assets if public is already linked - [@mattbrictson](https://github.com/mattbrictson)
 
 # [1.2.2][] (Jan 10 2017)
 
diff --git a/lib/capistrano/tasks/assets.rake b/lib/capistrano/tasks/assets.rake
index 7559eed..b882be6 100644
--- a/lib/capistrano/tasks/assets.rake
+++ b/lib/capistrano/tasks/assets.rake
@@ -120,7 +120,11 @@ end
 # as assets_prefix will always have a default value
 namespace :deploy do
   task :set_linked_dirs do
-    set :linked_dirs, fetch(:linked_dirs, []).push("public/#{fetch(:assets_prefix)}").uniq
+    linked_dirs = fetch(:linked_dirs, [])
+    unless linked_dirs.include?('public')
+      linked_dirs << "public/#{fetch(:assets_prefix)}"
+      set :linked_dirs, linked_dirs.uniq
+    end
   end
 end