diff --git a/app/views/bubbles/_pop_toggle.html.erb b/app/views/bubbles/_pop_toggle.html.erb
index 420aa1367..07ab43db8 100644
--- a/app/views/bubbles/_pop_toggle.html.erb
+++ b/app/views/bubbles/_pop_toggle.html.erb
@@ -11,10 +11,8 @@
       <%= image_tag "pop.svg", aria: { hidden: true }, size: 24, class: "colorize--white" %>
       <span>Pop</span>
     <% end %>
-    <% if event %>
-      <span class="bubble__pop-message">
-        (Pops automatically in <%= distance_of_time_in_words(Time.current, event.created_at + 30.days) %>.)
-      </span>
-    <% end %>
+    <span class="bubble__pop-message">
+      (Pops automatically in <%= distance_of_time_in_words(Time.current, (event&.created_at || bubble.created_at) + 30.days) %>.)
+    </span>
   <% end %>
 </div>