diff --git a/app/models/activity.rb b/app/models/activity.rb
index 9707baada..0afd62c67 100644
--- a/app/models/activity.rb
+++ b/app/models/activity.rb
@@ -147,10 +147,10 @@ class Activity < ApplicationRecord
       generate_breadcrumb(subject.team)
     when Step
       breadcrumbs[:step] = subject.name
-      generate_breadcrumbs(subject.my_module)
+      generate_breadcrumbs(subject.protocol)
     when Asset
       breadcrumbs[:asset] = subject.blob.filename.to_s
-      generate_breadcrumb(subject.result || subject.step)
+      generate_breadcrumb(subject.result || subject.step || subject.repository_cell.repository_row.repository)
     end
   end
 
diff --git a/app/models/asset.rb b/app/models/asset.rb
index f88c8fa1c..c75029c35 100644
--- a/app/models/asset.rb
+++ b/app/models/asset.rb
@@ -446,7 +446,7 @@ class Asset < ApplicationRecord
   end
 
   def my_module
-    (result || step).my_module
+    (result || step)&.my_module
   end
 
   private