diff --git a/app/views/case_logs/index.html.erb b/app/views/case_logs/index.html.erb
index 1ea22b5e5..583eac968 100644
--- a/app/views/case_logs/index.html.erb
+++ b/app/views/case_logs/index.html.erb
@@ -3,11 +3,7 @@
 
 <% content_for :title, title %>
 
-<% if current_user.support? %>
-  <%= render partial: "organisations/headings", locals: { main: "Logs", sub: nil } %>
-<% else %>
-  <%= render partial: "organisations/headings", locals: { main: "Logs", sub: current_user.organisation.name } %>
-<% end %>
+<%= render partial: "organisations/headings", locals: current_user.support? ? { main: "Logs", sub: nil } : { main: "Logs", sub: current_user.organisation.name } %>
 
 <div class="app-filter-layout" data-controller="filter-layout">
   <div class="govuk-button-group app-filter-toggle">
diff --git a/app/views/organisations/index.html.erb b/app/views/organisations/index.html.erb
index 02e39d83a..65f8134b7 100644
--- a/app/views/organisations/index.html.erb
+++ b/app/views/organisations/index.html.erb
@@ -3,13 +3,7 @@
 
 <% content_for :title, title %>
 
-<% if request.path == "/organisations" %>
-  <%= render partial: "headings", locals: { main: "Organisations", sub: nil } %>
-<% else %>
-  <%= render partial: "headings", locals: { main: @organisation.name, sub: "Organisations" } %>
-<% end %>
-
-<% items = tab_items(current_user) %>
+<%= render partial: "organisations/headings", locals: request.path == "/organisations" ? { main: "Organisations", sub: nil } : { main: @organisation.name, sub: "Organisations" } %>
 
 <h2 class="govuk-visually-hidden">Organisations</h2>
 
diff --git a/app/views/organisations/show.html.erb b/app/views/organisations/show.html.erb
index fd4ad36b6..5b82aedc7 100644
--- a/app/views/organisations/show.html.erb
+++ b/app/views/organisations/show.html.erb
@@ -2,8 +2,7 @@
 <% title = format_title(nil, current_user.support? ? "About this organisation" : "About your organisation", current_user, nil, nil, @organisation.name) %>
 <% content_for :title, title %>
 
-<% locals = current_user.support? ? { main: @organisation.name, sub: nil } : { main: "About your organisation", sub: current_user.organisation.name }%>
-<%= render partial: "organisations/headings", locals: locals %>
+<%= render partial: "organisations/headings", locals: current_user.support? ? { main: @organisation.name, sub: nil } : { main: "About your organisation", sub: current_user.organisation.name } %>
 
 <% if current_user.support? %>
   <%= render SubNavigationComponent.new(
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index c1aab5e09..3444479c2 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -3,11 +3,7 @@
 
 <% content_for :title, title %>
 
-<% if current_user.support? %>
-  <%= render partial: "organisations/headings", locals: { main: "Users", sub: nil } %>
-<% else %>
-  <%= render partial: "organisations/headings", locals: { main: "User", sub: current_user.organisation.name } %>
-<% end %>
+<%= render partial: "organisations/headings", locals: current_user.support? ? { main: "Users", sub: nil } : { main: "User", sub: current_user.organisation.name } %>
 
 <h2 class="govuk-visually-hidden">Users</h2>