diff --git a/app/views/timelines/edit.html.erb b/app/views/timelines/edit.html.erb
index 0f14ce5c..0a2846c2 100644
--- a/app/views/timelines/edit.html.erb
+++ b/app/views/timelines/edit.html.erb
@@ -229,6 +229,7 @@
               </div>
               <ul class="collapsible">
                 <% event.timeline_event_entities.order('entity_type').preload(:entity).group_by(&:entity_type).each do |entity_type, entity_list| %>
+                  <% entity_list.reject! { |te_entity| te_entity.entity.nil? } %>
                   <li>
                     <% klass = content_class_from_name(entity_type) %>
                     <div class="collapsible-header">
diff --git a/app/views/timelines/show.html.erb b/app/views/timelines/show.html.erb
index 6eb86ddf..006aa412 100644
--- a/app/views/timelines/show.html.erb
+++ b/app/views/timelines/show.html.erb
@@ -96,6 +96,7 @@
                 </div>
                 <ul class="collapsible">
                   <% event_entities.each do |entity_type, entity_list| %>
+                    <% entity_list.reject! { |te_entity| te_entity.entity.nil? } %>
                     <li>
                       <% klass = content_class_from_name(entity_type) %>
                       <div class="collapsible-header">