diff --git a/app/models/abilities/everyone.rb b/app/models/abilities/everyone.rb
index 32f948a5a..dd692c269 100644
--- a/app/models/abilities/everyone.rb
+++ b/app/models/abilities/everyone.rb
@@ -7,8 +7,12 @@ module Abilities
       can [:read, :map, :summary, :share], Proposal
       can :read, Comment
       can :read, Poll
-      cannot :results, Poll, results_enabled: false
-      cannot :stats, Poll, stats_enabled: false
+      can :results, Poll do |poll|
+        poll.expired? && poll.results_enabled?
+      end
+      can :stats, Poll do |poll|
+        poll.expired? && poll.stats_enabled?
+      end
       can :read, Poll::Question
       can [:read, :welcome], Budget
       can :read, SpendingProposal