diff --git a/app/views/manage/bookings/show.html.slim b/app/views/manage/bookings/show.html.slim
index 9cbab739a..0e66fb326 100644
--- a/app/views/manage/bookings/show.html.slim
+++ b/app/views/manage/bookings/show.html.slim
@@ -117,7 +117,7 @@
                 dt= Booking.human_attribute_name(:state)
                 dd= @booking.booking_state.translate
 
-                - if @booking.deadline.present?
+                - if @booking.deadline&.at.present?
                   dt= Deadline.model_name.human
                   dd= link_to l(@booking.deadline.at, format: :short), edit_manage_booking_deadline_path(@booking)
 
diff --git a/app/views/public/bookings/_form.html.slim b/app/views/public/bookings/_form.html.slim
index 96c1d58f6..42bca79ff 100644
--- a/app/views/public/bookings/_form.html.slim
+++ b/app/views/public/bookings/_form.html.slim
@@ -22,7 +22,7 @@
           = @booking.errors.full_messages.to_sentence
       = image_tag current_organisation.logo, class: 'mx-auto d-block m-4', style: 'max-width: 180px; max-height: 180px;' if current_organisation&.logo.present?
       fieldset
-        - if @booking.deadline
+        - if @booking.deadline&.at
           .mb-3
             label=Booking.human_attribute_name(:deadline)
             div