diff --git a/app/views/shipit/stacks/_banners.html.erb b/app/views/shipit/stacks/_banners.html.erb
index bb1184ff9..821a47648 100644
--- a/app/views/shipit/stacks/_banners.html.erb
+++ b/app/views/shipit/stacks/_banners.html.erb
@@ -80,7 +80,9 @@
       </div>
     </div>
   </div>
-<% elsif !stack.deployment_checks_passed? %>
+<% end %>
+
+<% if !stack.deployment_checks_passed? %>
   <div class="banner banner--orange">
     <div class="banner__inner wrapper">
       <div class="banner__content">
diff --git a/test/controllers/stacks_controller_test.rb b/test/controllers/stacks_controller_test.rb
index 699144762..0749cc06f 100644
--- a/test/controllers/stacks_controller_test.rb
+++ b/test/controllers/stacks_controller_test.rb
@@ -109,6 +109,26 @@ class StacksControllerTest < ActionController::TestCase
       assert_select 'a[href="http://google.com"]'
     end
 
+    test "#show renders both the delayed and external-lock banners when both apply" do
+      failing_checks = Class.new do
+        def self.call(_stack)
+          false
+        end
+      end
+      Shipit.deployment_checks = failing_checks
+      @stack.update!(continuous_deployment: true, continuous_delivery_delayed_since: Time.current)
+      assert @stack.continuous_delivery_delayed?
+      refute @stack.deployment_checks_passed?
+
+      get :show, params: { id: @stack.to_param }
+
+      assert_response :ok
+      assert_select '.banner .banner__title', text: 'Continuous Delivery Delayed!'
+      assert_select '.banner--orange .banner__title', text: 'Stack has been locked by external system!'
+    ensure
+      Shipit.deployment_checks = nil
+    end
+
     test "#create creates a Stack, queues a job to setup webhooks and redirects to it" do
       assert_difference "Stack.count" do
         post :create, params: {