diff --git a/src/components/comments/CommentsSection.tsx b/src/components/comments/CommentsSection.tsx
index 7d0ed584b..908ca0407 100644
--- a/src/components/comments/CommentsSection.tsx
+++ b/src/components/comments/CommentsSection.tsx
@@ -1,7 +1,6 @@
 import { Checkbox } from 'antd'
 import clsx from 'clsx'
 import { FC } from 'react'
-import { useIsMyAddressWhitelisted } from 'src/config/constants'
 import { PostWithSomeDetails, SpaceStruct } from 'src/types'
 import useLocalStorage from 'use-local-storage'
 import { useIsMyAddress } from '../auth/MyAccountsContext'
@@ -31,16 +30,11 @@ export const CommentSection: FC<CommentSectionProps> = ({
   const { id, repliesCount, ownerId } = struct
   const isPostAuthor = useIsMyAddress(ownerId)
 
-  const isWhitelisted = useIsMyAddressWhitelisted()
   let [showAllComments, setShowAllComments] = useLocalStorage<boolean>('showAllComments', false, {
     parser: str => str === 'true',
     serializer: bool => String(bool),
   })
 
-  if (!isWhitelisted) {
-    showAllComments = true
-  }
-
   return (
     <Section
       id={hashId}
@@ -52,17 +46,15 @@ export const CommentSection: FC<CommentSectionProps> = ({
         <h3>
           <Pluralize count={repliesCount || 0} singularText='comment' />
         </h3>
-        {isWhitelisted && (
-          <Checkbox
-            checked={showAllComments}
-            style={{ marginRight: '-8px' }}
-            onChange={e => setShowAllComments(e.target.checked)}
-          >
-            <span className='ColorMuted' style={{ userSelect: 'none' }}>
-              Show all comments
-            </span>
-          </Checkbox>
-        )}
+        <Checkbox
+          checked={showAllComments}
+          style={{ marginRight: '-8px' }}
+          onChange={e => setShowAllComments(e.target.checked)}
+        >
+          <span className='ColorMuted' style={{ userSelect: 'none' }}>
+            Show all comments
+          </span>
+        </Checkbox>
       </div>
       <NewComment post={struct} asStub eventProps={{ eventSource, level: 0, isPostAuthor }} />
       <ViewCommentsTree