1 files changed, 2 insertions, 4 deletions
diff --git a/app/models/concerns/expirable.rb b/app/models/concerns/expirable.rb
index cc55315d6d7..af139e735af 100644
--- a/app/models/concerns/expirable.rb
+++ b/app/models/concerns/expirable.rb
@@ -6,10 +6,8 @@ module Expirable
   DAYS_TO_EXPIRE = 7
 
   included do
-    scope :not, ->(scope) { where(scope.arel.constraints.reduce(:and).not) }
-
-    scope :expired, -> { where.not(expires_at: nil).where(arel_table[:expires_at].lteq(Time.current)) }
-    scope :not_expired, -> { self.not(expired) }
+    scope :expired, -> { where(arel_table[:expires_at].lteq(Time.current)) }
+    scope :not_expired, -> { where(arel_table[:expires_at].gt(Time.current)).or(where(expires_at: nil)) }
   end
 
   def expired?