diff --git a/app/models/lfs_object.rb b/app/models/lfs_object.rb
index 43b845b29c6..a243c7b77cc 100644
--- a/app/models/lfs_object.rb
+++ b/app/models/lfs_object.rb
@@ -8,7 +8,7 @@ class LfsObject < ActiveRecord::Base
 
   def storage_project(project)
     if project && project.forked?
-      project.forked_from_project
+      storage_project(project.forked_from_project)
     else
       project
     end
diff --git a/lib/gitlab/lfs/response.rb b/lib/gitlab/lfs/response.rb
index 9be9a65671b..9d9617761b3 100644
--- a/lib/gitlab/lfs/response.rb
+++ b/lib/gitlab/lfs/response.rb
@@ -220,7 +220,7 @@ module Gitlab
 
       def storage_project(project)
         if project.forked?
-          project.forked_from_project
+          storage_project(project.forked_from_project)
         else
           project
         end