diff --git a/app/helpers/reports_helper.rb b/app/helpers/reports_helper.rb
index 133194386..f3badbef0 100644
--- a/app/helpers/reports_helper.rb
+++ b/app/helpers/reports_helper.rb
@@ -125,7 +125,9 @@ module ReportsHelper
   def assigned_repository_or_snapshot(my_module, element_id, snapshot, repository)
     if element_id
       repository = Repository.accessible_by_teams(my_module.experiment.project.team).find_by(id: element_id)
-      repository ||= my_module.repository_snapshots.find_by(id: element_id)
+      repository ||= RepositorySnapshot.joins(my_module: { experiment: :project })
+                                       .where(my_module: { experiments: { project: my_module.experiment.project } })
+                                       .find_by(id: element_id)
     end
     repository || snapshot
   end
diff --git a/app/views/reports/elements/_my_module_repository_element.html.erb b/app/views/reports/elements/_my_module_repository_element.html.erb
index 590b930ee..09b14e5a6 100644
--- a/app/views/reports/elements/_my_module_repository_element.html.erb
+++ b/app/views/reports/elements/_my_module_repository_element.html.erb
@@ -5,7 +5,7 @@
 <% repository = assigned_repository_or_snapshot(my_module, element_id, repository, repository_snapshot) %>
 <% order ||= @order %>
 <% timestamp = Time.current + 1.year - 1.days %>
-<% rows_json = repository.present? ? my_module.repository_json_hot(repository, order) : {} %>
+<% rows_json = my_module.repository_json_hot(repository, order) %>
 <div class="report-element report-module-repository-element"
      data-sort-hot="1"
      data-ts="<%= timestamp.to_i %>"
@@ -37,7 +37,7 @@
     </div>
   </div>
   <div class="report-element-body">
-    <% if rows_json.present? && rows_json[:data].count > 0 %>
+    <% if rows_json[:data].count > 0 %>
       <input type="hidden" class="hot-table-contents hot-samples" value='<%= rows_json.to_json.force_encoding(Encoding::UTF_8) %>' />
       <div class="hot-table-container"></div>
       <table class="report-common-table-format"></table>