diff --git a/CHANGELOG b/CHANGELOG
index 75fddce0eda3987510f9cdfaee6743422b596ce4..f038654cfd257f71cb92e3309dcfe936840d3201 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 Please view this file on the master branch, on stable branches it's out of date.
 
 v 8.7.0 (unreleased)
+  - Don't attempt to fetch any tags from a forked repo (Stan Hu)
   - Don't attempt to look up an avatar in repo if repo directory does not exist (Stan hu)
   - Preserve time notes/comments have been updated at when moving issue
   - Make HTTP(s) label consistent on clone bar (Stan Hu)
diff --git a/app/models/repository.rb b/app/models/repository.rb
index ff24b75dcd1be299ded0e5cc3bb326e0307c0f06..bf76de61148c9ac2d8bbf61f394547922f5e130b 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -820,7 +820,7 @@ class Repository
   end
 
   def fetch_ref(source_path, source_ref, target_ref)
-    args = %W(#{Gitlab.config.git.bin_path} fetch -f #{source_path} #{source_ref}:#{target_ref})
+    args = %W(#{Gitlab.config.git.bin_path} fetch --no-tags -f #{source_path} #{source_ref}:#{target_ref})
     Gitlab::Popen.popen(args, path_to_repo)
   end