diff --git a/app/views/global_activities/references/_project.html.erb b/app/views/global_activities/references/_project.html.erb
index f515afed9..60da56168 100644
--- a/app/views/global_activities/references/_project.html.erb
+++ b/app/views/global_activities/references/_project.html.erb
@@ -1,5 +1,5 @@
 <%= render partial: "global_activities/references/team.html.erb",
-           locals: { team: team, subject: subject&.team, breadcrumbs: breadcrumbs, values: values, type_of: type_of } %>
+           locals: { team: team, subject: team, breadcrumbs: breadcrumbs, values: values, type_of: type_of } %>
 <div class="ga-breadcrumb">
   <%= image_tag 'icon_small/project.svg' %>
   <% if subject %>
diff --git a/app/views/global_activities/references/_project_folder.html.erb b/app/views/global_activities/references/_project_folder.html.erb
index 09c7100e8..fa7b9e973 100644
--- a/app/views/global_activities/references/_project_folder.html.erb
+++ b/app/views/global_activities/references/_project_folder.html.erb
@@ -1,5 +1,5 @@
 <%= render partial: "global_activities/references/team.html.erb",
-           locals: { team: team, subject: subject&.team, breadcrumbs: breadcrumbs, values: values, type_of: type_of } %>
+           locals: { team: team, subject: team, breadcrumbs: breadcrumbs, values: values, type_of: type_of } %>
 <div class="ga-breadcrumb">
   <span class="fas fa-folder"></span>
 
diff --git a/app/views/global_activities/references/_protocol.html.erb b/app/views/global_activities/references/_protocol.html.erb
index 74bb2315e..b8743a474 100644
--- a/app/views/global_activities/references/_protocol.html.erb
+++ b/app/views/global_activities/references/_protocol.html.erb
@@ -1,6 +1,6 @@
 <% if subject.in_repository? %>
   <%= render partial: "global_activities/references/team.html.erb",
-             locals: { team: team, subject: subject&.team, breadcrumbs: breadcrumbs, values: values, type_of: type_of } %>
+             locals: { team: team, subject: team, breadcrumbs: breadcrumbs, values: values, type_of: type_of } %>
 <% else %>
   <%= render partial: "global_activities/references/my_module.html.erb",
              locals: { team: team, subject: subject&.my_module, breadcrumbs: breadcrumbs, values: values, type_of: type_of } %>
diff --git a/app/views/global_activities/references/_report.html.erb b/app/views/global_activities/references/_report.html.erb
index 0abdcf90c..9bcb7acef 100644
--- a/app/views/global_activities/references/_report.html.erb
+++ b/app/views/global_activities/references/_report.html.erb
@@ -1,5 +1,5 @@
 <%= render partial: "global_activities/references/team.html.erb",
-           locals: { team: team, subject: subject&.team, breadcrumbs: breadcrumbs, values: values, type_of: type_of } %>
+           locals: { team: team, subject: team, breadcrumbs: breadcrumbs, values: values, type_of: type_of } %>
 <div class="ga-breadcrumb">
   <span class="fas fa-clipboard-check"></span>
   <% if subject %>
diff --git a/app/views/global_activities/references/_repository_base.html.erb b/app/views/global_activities/references/_repository_base.html.erb
index 8c43fab04..ed1c9e144 100644
--- a/app/views/global_activities/references/_repository_base.html.erb
+++ b/app/views/global_activities/references/_repository_base.html.erb
@@ -1,5 +1,5 @@
 <%= render partial: "global_activities/references/team.html.erb",
-           locals: { team: team, subject: subject&.team, breadcrumbs: breadcrumbs, values: values, type_of: type_of } %>
+           locals: { team: team, subject: team, breadcrumbs: breadcrumbs, values: values, type_of: type_of } %>
 <div class="ga-breadcrumb">
   <span class="fas fa-list-alt"></span>
   <% if subject %>
diff --git a/app/views/global_activities/references/_team.html.erb b/app/views/global_activities/references/_team.html.erb
index e257869ac..484e05137 100644
--- a/app/views/global_activities/references/_team.html.erb
+++ b/app/views/global_activities/references/_team.html.erb
@@ -1,10 +1,10 @@
 <div class="ga-breadcrumb">
   <span class="fas fa-users"></span>
-  <% if subject %>
-    <%= route_to_other_team projects_path(team: subject.id),
-                            subject,
-                            subject.name&.truncate(Constants::NAME_TRUNCATION_LENGTH),
-                            title: subject.name %>
+  <% if team %>
+    <%= route_to_other_team projects_path(team: team.id),
+                            team,
+                            team.name&.truncate(Constants::NAME_TRUNCATION_LENGTH),
+                            title: team.name %>
   <% else %>
     <span title="<%= breadcrumbs['team'] %>">
       <%= breadcrumbs['team']&.truncate(Constants::NAME_TRUNCATION_LENGTH) %>