diff --git a/app/models/project.rb b/app/models/project.rb
index d0b8055636aed0ab7899f9fd65dd0c9397e35ca6..e9d93cda1c4e437a1e1085d6a12a92520e803890 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -486,7 +486,9 @@ class Project < ActiveRecord::Base
   end
 
   def has_container_registry_tags?
-    @images ||= container_repositories.to_a.any?(&:has_tags?) ||
+    return @images if defined?(@images)
+
+    @images = container_repositories.to_a.any?(&:has_tags?) ||
       has_root_container_repository_tags?
   end