diff --git a/app/views/my_module_comments/_comment.html.erb b/app/views/my_module_comments/_comment.html.erb
index 0bd54fc3d..f2510df6e 100644
--- a/app/views/my_module_comments/_comment.html.erb
+++ b/app/views/my_module_comments/_comment.html.erb
@@ -36,5 +36,5 @@
 </div>
 <strong><%= comment.user.full_name %>:</strong>
 <div data-role="comment-message-container">
-  <div data-role="comment-message"><%= custom_auto_link(comment.message) %></div>
+  <div data-role="comment-message"><%= custom_auto_link(comment.message, team: current_team) %></div>
 </div>
diff --git a/app/views/my_modules/_description_label.html.erb b/app/views/my_modules/_description_label.html.erb
index de442958b..c41bac642 100644
--- a/app/views/my_modules/_description_label.html.erb
+++ b/app/views/my_modules/_description_label.html.erb
@@ -1,5 +1,5 @@
 <% if @my_module.description.blank? %>
   <em><%=t "experiments.canvas.popups.no_description" %></em>
 <% else %>
-  <%= custom_auto_link(@my_module.description) %>
+  <%= custom_auto_link(@my_module.description, team: current_team) %>
 <% end %>
diff --git a/app/views/project_comments/_comment.html.erb b/app/views/project_comments/_comment.html.erb
index 31f23294c..3f412e4ad 100644
--- a/app/views/project_comments/_comment.html.erb
+++ b/app/views/project_comments/_comment.html.erb
@@ -36,5 +36,6 @@
 </div>
 <strong><%= comment.user.full_name %>:</strong>
 <div data-role="comment-message-container">
-  <div data-role="comment-message"><%= custom_auto_link(comment.message) %></div>
+  <% byebug %>
+  <div data-role="comment-message"><%= custom_auto_link(comment.message, team: current_team) %></div>
 </div>
diff --git a/app/views/projects/experiment_archive/_experiment.html.erb b/app/views/projects/experiment_archive/_experiment.html.erb
index 5bde368ce..fe27a09d7 100644
--- a/app/views/projects/experiment_archive/_experiment.html.erb
+++ b/app/views/projects/experiment_archive/_experiment.html.erb
@@ -67,7 +67,7 @@
     </div>
     <div class="row">
       <div class="col-xs-12">
-        <%= custom_auto_link(experiment.description) %>
+        <%= custom_auto_link(experiment.description, team: current_team) %>
       </div>
     </div>
   </div>
diff --git a/app/views/projects/show/_experiment.html.erb b/app/views/projects/show/_experiment.html.erb
index 3bcecb4c0..8cfc517e0 100644
--- a/app/views/projects/show/_experiment.html.erb
+++ b/app/views/projects/show/_experiment.html.erb
@@ -46,7 +46,7 @@
       <div data-hook="experiment-card-body">
         <% if experiment.description? %>
           <div class='experiment-description'>
-            <%= custom_auto_link(experiment.description) %>
+            <%= custom_auto_link(experiment.description, team: current_team) %>
           </div>
         <% else %>
           <span class='experiment-no-description'>
diff --git a/app/views/result_comments/_comment.html.erb b/app/views/result_comments/_comment.html.erb
index 5dd51f498..5ff52adab 100644
--- a/app/views/result_comments/_comment.html.erb
+++ b/app/views/result_comments/_comment.html.erb
@@ -38,5 +38,5 @@
   <% end %>
 </div>
 <div data-role="comment-message-container">
-  <div data-role="comment-message"><%= custom_auto_link(comment.message) %></div>
+  <div data-role="comment-message"><%= custom_auto_link(comment.message, team: current_team) %></div>
 </div>
diff --git a/app/views/results/_result_text.html.erb b/app/views/results/_result_text.html.erb
index 4cd3f1f3e..18fee6a24 100644
--- a/app/views/results/_result_text.html.erb
+++ b/app/views/results/_result_text.html.erb
@@ -1,5 +1,6 @@
 <div class="ql-editor">
   <%= custom_auto_link(generate_image_tag_from_token(result.result_text.text, result.result_text),
                        simple_format: false,
-                       tags: %w(img)) %>
+                       tags: %w(img),
+                       team: current_team) %>
 </div>
diff --git a/app/views/step_comments/_comment.html.erb b/app/views/step_comments/_comment.html.erb
index 6d85aac1d..628aa12b7 100644
--- a/app/views/step_comments/_comment.html.erb
+++ b/app/views/step_comments/_comment.html.erb
@@ -38,5 +38,5 @@
   <% end %>
 </div>
 <div data-role="comment-message-container">
-  <div data-role="comment-message"><%= custom_auto_link(comment.message)%></div>
+  <div data-role="comment-message"><%= custom_auto_link(comment.message, team: current_team)%></div>
 </div>
diff --git a/app/views/steps/_step.html.erb b/app/views/steps/_step.html.erb
index d1f5b7398..be03e4616 100644
--- a/app/views/steps/_step.html.erb
+++ b/app/views/steps/_step.html.erb
@@ -55,7 +55,8 @@
               <div class="ql-editor">
                 <%= custom_auto_link(generate_image_tag_from_token(step.description, step),
                                      simple_format: false,
-                                     tags: %w(img)) %>
+                                     tags: %w(img),
+                                     team: current_team) %>
               </div>
             <% end %>
           </div>
@@ -95,7 +96,7 @@
           <% unless step.checklists.blank? then %>
             <div class="col-xs-12">
               <% step.checklists.asc.each do |checklist| %>
-                <strong><%= custom_auto_link(checklist.name) %></strong>
+                <strong><%= custom_auto_link(checklist.name, team: current_team) %></strong>
                 <% if checklist.checklist_items.empty? %>
                   </br>
                   <%= t("protocols.steps.empty_checklist") %>
@@ -114,7 +115,7 @@
                                  value=""
                                  disabled="disabled" />
                         <% end %>
-                        <%= custom_auto_link(checklist_item.text) %>
+                        <%= custom_auto_link(checklist_item.text, team: current_team) %>
                       </label>
                     </div>
                   <% end %>