diff --git a/plugins/poll/plugin.rb b/plugins/poll/plugin.rb
index 76f814beffe..853e39cde3d 100644
--- a/plugins/poll/plugin.rb
+++ b/plugins/poll/plugin.rb
@@ -14,15 +14,6 @@ VOTES_CUSTOM_FIELD ||= "polls-votes".freeze
 
 after_initialize do
 
-  # PERF, avoids N+1 in serializer
-  TopicView.add_post_custom_fields_whitelister do |user|
-    POLLS_CUSTOM_FIELD
-  end
-
-  TopicView.add_post_custom_fields_whitelister do |user|
-    VOTES_CUSTOM_FIELD
-  end
-
   # remove "Vote Now!" & "Show Results" links in emails
   Email::Styles.register_plugin_style do |fragment|
     fragment.css(".poll a.cast-votes, .poll a.toggle-results").each(&:remove)