1 files changed, 9 insertions, 1 deletions
diff --git a/app/models/preloaders/environments/deployment_preloader.rb b/app/models/preloaders/environments/deployment_preloader.rb
index fcf892698bb..592d3e54a30 100644
--- a/app/models/preloaders/environments/deployment_preloader.rb
+++ b/app/models/preloaders/environments/deployment_preloader.rb
@@ -34,8 +34,16 @@ module Preloaders
         deployments_by_environment_id = deployments.index_by(&:environment_id)
 
         environments.each do |environment|
-          environment.association(association_name).target = deployments_by_environment_id[environment.id]
+          associated_deployment = deployments_by_environment_id[environment.id]
+
+          environment.association(association_name).target = associated_deployment
           environment.association(association_name).loaded!
+
+          if associated_deployment
+            # `last?` in DeploymentEntity requires this environment to be loaded
+            associated_deployment.association(:environment).target = environment
+            associated_deployment.association(:environment).loaded!
+          end
         end
       end
     end