diff --git a/app/views/cards/_messages.html.erb b/app/views/cards/_messages.html.erb
index cbf7a40d0..042c25ed5 100644
--- a/app/views/cards/_messages.html.erb
+++ b/app/views/cards/_messages.html.erb
@@ -1,23 +1,25 @@
 <%= messages_tag(card) do %>
-  <%= render partial: "cards/comments/comment", collection: card.comments.chronologically, cached: true %>
-  <%= render "cards/comments/new", card: card %>
+  <% if card.published? %>
+    <%= render partial: "cards/comments/comment", collection: card.comments.chronologically, cached: true %>
+    <%= render "cards/comments/new", card: card %>
 
-  <div class="comments__subscribers flex flex-column margin-block txt-align-start full-width">
-    <strong class="txt-uppercase">Subscribers</strong>
+    <div class="comments__subscribers flex flex-column margin-block-start txt-align-start full-width">
+      <strong class="txt-uppercase">Subscribers</strong>
 
-    <p class="margin-none-block-start margin-block-end-half">
-      <%= pluralize(@card.watchers.without(User.system).count, "person") %> will be notified when someone comments on this.
-    </p>
+      <p class="margin-none-block-start margin-block-end-half">
+        <%= pluralize(@card.watchers.without(User.system).count, "person") %> will be notified when someone comments on this.
+      </p>
 
-    <div class="flex align-center flex-wrap gap-half max-width txt-normal">
-      <% prepend_current_user_to(@card.watchers.without(User.system).alphabetically).each do |watcher| %>
-        <%= avatar_tag watcher %>
-      <% end %>
+      <div class="flex align-center flex-wrap gap-half max-width txt-normal">
+        <% prepend_current_user_to(@card.watchers.without(User.system).alphabetically).each do |watcher| %>
+          <%= avatar_tag watcher %>
+        <% end %>
+      </div>
     </div>
+  <% end %>
 
-    <div class="txt-align-center full-width flex flex-column margin-block-start-double">
-      <hr class="separator--horizontal full-width margin-block" style="--border-color: var(--color-ink-lighter)">
-      <%= button_to_delete_card(@card) %>
-    </div>
+  <div class="txt-align-center full-width flex flex-column margin-block-start-double">
+    <hr class="separator--horizontal full-width margin-block" style="--border-color: var(--color-ink-lighter)">
+    <%= button_to_delete_card(@card) %>
   </div>
 <% end %>
diff --git a/app/views/cards/show.html.erb b/app/views/cards/show.html.erb
index 56ca920bb..ef0989929 100644
--- a/app/views/cards/show.html.erb
+++ b/app/views/cards/show.html.erb
@@ -32,7 +32,7 @@
 <div data-controller="beacon" data-beacon-url-value="<%= card_reading_url(@card) %>">
   <%= render "cards/container", card: @card %>
 
-  <% if @card.published? %>
+  <% if @card.published? || @card.drafted? %>
     <%= render "cards/messages", card: @card %>
   <% end %>
 </div>