diff --git a/app/models/event.rb b/app/models/event.rb
index aee5cf75..20e200db 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -22,10 +22,10 @@ class Event < ApplicationRecord
   default_scope       -> { where(label: Whitelabel[:label_id]) }
 
   scope :with_topics, -> { joins(:topics).distinct }
-  scope :current,     -> { where(date: Date.today.to_time..(Time.now + 9.weeks)).limit(1).order('date ASC') }
-  scope :latest,      -> { where('date < ?', Date.today.to_time).order('date DESC') }
+  scope :current,     -> { where(date: Date.today.to_time..).limit(1).order(date: :asc) }
+  scope :latest,      -> { where('date < ?', Date.today.to_time).order(date: :desc) }
   scope :unpublished, -> { where('published IS NULL') }
-  scope :ordered,     -> { order('date DESC') }
+  scope :ordered,     -> { order(date: :desc) }
 
   def end_date
     date + 2.hours
diff --git a/app/models/highlight.rb b/app/models/highlight.rb
index 814f90bb..7471ca6f 100644
--- a/app/models/highlight.rb
+++ b/app/models/highlight.rb
@@ -5,7 +5,7 @@ class Highlight < ApplicationRecord
 
   default_scope -> { where(label: Whitelabel[:label_id]) }
 
-  scope :active, -> { where('end_at > ?', Time.now).order('start_at').limit(1) }
+  scope :active, -> { where('end_at > ?', Time.now).order(start_at: :asc).limit(1) }
 
   def disabled?
     end_at <= Time.now
diff --git a/spec/models/event_spec.rb b/spec/models/event_spec.rb
index 74dff5bc..11d3aa7f 100644
--- a/spec/models/event_spec.rb
+++ b/spec/models/event_spec.rb
@@ -24,6 +24,8 @@
     it 'finds a current event' do
       event_next = create(:event, date: 2.days.from_now)
       expect(Event.current.first).to eql(event_next)
+      event_next.update(date: 5.months.from_now)
+      expect(Event.current.first).to eql(event_next)
     end
   end