diff --git a/app/models/event_callbacks.rb b/app/models/event_callbacks.rb
index a4f31f51..f874c430 100644
--- a/app/models/event_callbacks.rb
+++ b/app/models/event_callbacks.rb
@@ -18,7 +18,7 @@ class EventCallbacks
     return unless event.will_save_change_to_moderated? && event.moderated?
 
     event.decision_time = Time.zone.now
-    create_repeats event if event.repeat.try(:positive?) && event.rule
+    create_repeats event if event.repeat&.positive? && event.rule
   end
 
   def self.after_update(event)
diff --git a/app/views/events/_event.haml b/app/views/events/_event.haml
index 549f2376..08cdc54b 100644
--- a/app/views/events/_event.haml
+++ b/app/views/events/_event.haml
@@ -6,5 +6,5 @@
   = link_to event do
     %strong.city{ title: event.address }= event.city
     = event.title
-    - if event.repeat.positive?
+    - if event.repeat&.positive?
       %em.fa.fa-repeat{ title: event.schedule }
diff --git a/app/views/events/show.html.haml b/app/views/events/show.html.haml
index 34c8a43f..8e5d0a99 100644
--- a/app/views/events/show.html.haml
+++ b/app/views/events/show.html.haml
@@ -64,14 +64,14 @@
       encode: (request.format == 'text/html' ? :javascript : nil),
       replace_at: ' CHEZ ', replace_dot: ' POINT '
 
-- if @event.tags && @event.tags.present?
+- if @event.tags&.present?
   %p.tags
     %em.fa.fa-tags
     %span.label= Event.human_attribute_name :tags
     - @event.tags.each do |tag|
       = link_to tag, tag_path(tag.name), rel: :tag
 
-- if @event.repeat > 0 && @event.rule
+- if @event.repeat&.positive? && @event.rule
   %h3
     %em.fa.fa-repeat
     = @event.schedule
diff --git a/app/views/events/show.text.haml b/app/views/events/show.text.haml
index 9d12a972..0381e048 100644
--- a/app/views/events/show.text.haml
+++ b/app/views/events/show.text.haml
@@ -11,7 +11,7 @@
 - if @event.contact.present?
   != display_attr @event, :contact
 != display_attr @event, :tag_list, @event.tag_list
-- if @event.repeat > 0
+- if @event.repeat&.positive?
   = display_attr @event, :repeat
   = display_attr @event, :rule, t(@event.rule, scope: 'activerecord.attributes.event.rule_values')
 \