diff --git a/src/components/DictionaryCrud/DictionaryCrudPresentation.js b/src/components/DictionaryCrud/DictionaryCrudPresentation.js
index 3f4e254d3..94fbb88d5 100644
--- a/src/components/DictionaryCrud/DictionaryCrudPresentation.js
+++ b/src/components/DictionaryCrud/DictionaryCrudPresentation.js
@@ -14,15 +14,11 @@ import {
   TYPE_WORD,
   TYPE_PHRASE,
   PUBLIC,
-  TEAM,
 } from 'common/constants'
 import getIcon from 'common/utils/getIcon'
 import { definitions } from 'common/utils/validationHelpers'
 import useEditForm from 'common/hooks/useEditForm'
 import useSearchParamsState from 'common/hooks/useSearchParamsState'
-import { useParams } from 'react-router-dom'
-import { useUserStore } from 'context/UserContext'
-import { ASSISTANT } from '../../common/constants/roles'
 
 function DictionaryCrudPresentation({
   backHandler,
@@ -56,12 +52,6 @@ function DictionaryCrudPresentation({
     translations: definitions.textArray(),
   })
 
-  const { sitename } = useParams()
-  const { user } = useUserStore()
-  const userRoles = user?.roles || {}
-  const userSiteRole = userRoles?.[sitename] || ''
-  const isAssistant = userSiteRole === ASSISTANT
-
   const defaultValues = {
     acknowledgements: [],
     alternateSpellings: [],
@@ -76,7 +66,7 @@ function DictionaryCrudPresentation({
     title: '',
     type: type || TYPE_WORD,
     translations: [],
-    visibility: isAssistant ? TEAM : PUBLIC,
+    visibility: PUBLIC,
     includeInKids: 'true',
     includeInGames: 'true',
   }
@@ -291,11 +281,7 @@ function DictionaryCrudPresentation({
         return (
           <Fragment key={step}>
             <div className="col-span-12">
-              <Form.Visibility
-                control={control}
-                errors={errors}
-                reduceAssistantOptions={isAssistant}
-              />
+              <Form.Visibility control={control} errors={errors} />
             </div>
             <div className="col-span-12">
               <Form.RadioButtons
diff --git a/src/components/Form/Visibility.js b/src/components/Form/Visibility.js
index b055f2f7d..1673b74a2 100644
--- a/src/components/Form/Visibility.js
+++ b/src/components/Form/Visibility.js
@@ -4,17 +4,22 @@ import PropTypes from 'prop-types'
 // FPCC
 import Select from 'components/Form/Select'
 import { useSiteStore } from 'context/SiteContext'
+import { useUserStore } from 'context/UserContext'
+import { ASSISTANT } from '../../common/constants/roles'
 
 function Visibility({
   control,
   errors,
   label = 'Who can see this entry?',
-  reduceAssistantOptions = false,
 } = {}) {
   const { site } = useSiteStore()
+  const { user } = useUserStore()
+  const userRoles = user?.roles || {}
+  const userSiteRole = userRoles?.[site?.sitename] || ''
+  const isAssistant = userSiteRole === ASSISTANT
 
   const options = (function _() {
-    if (reduceAssistantOptions) {
+    if (isAssistant) {
       const optionsLen = site?.visibilityOptions.length
       for (let i = 0; i < optionsLen; i += 1) {
         if (site?.visibilityOptions[i]?.value !== 'team') {
@@ -42,12 +47,11 @@ function Visibility({
   )
 }
 // PROPTYPES
-const { object, string, bool } = PropTypes
+const { object, string } = PropTypes
 Visibility.propTypes = {
   label: string,
   control: object,
   errors: object,
-  reduceAssistantOptions: bool,
 }
 
 export default Visibility
diff --git a/src/components/SongCrud/SongCrudPresentation.js b/src/components/SongCrud/SongCrudPresentation.js
index ff9dae5de..7e005ce0d 100644
--- a/src/components/SongCrud/SongCrudPresentation.js
+++ b/src/components/SongCrud/SongCrudPresentation.js
@@ -8,10 +8,7 @@ import Form from 'components/Form'
 import DeleteButton from 'components/DeleteButton'
 import { definitions } from 'common/utils/validationHelpers'
 import useEditForm from 'common/hooks/useEditForm'
-import { AUDIO, IMAGE, VIDEO, PUBLIC, TEAM } from 'common/constants'
-import { useParams } from 'react-router-dom'
-import { useUserStore } from 'context/UserContext'
-import { ASSISTANT } from '../../common/constants/roles'
+import { AUDIO, IMAGE, VIDEO, PUBLIC } from 'common/constants'
 
 function SongCrudPresentation({
   backHandler,
@@ -37,12 +34,6 @@ function SongCrudPresentation({
     relatedVideos: definitions.idArray(),
   })
 
-  const { sitename } = useParams()
-  const { user } = useUserStore()
-  const userRoles = user?.roles || {}
-  const userSiteRole = userRoles?.[sitename] || ''
-  const isAssistant = userSiteRole === ASSISTANT
-
   const defaultValues = {
     title: '',
     titleTranslation: '',
@@ -56,7 +47,7 @@ function SongCrudPresentation({
     relatedVideos: [],
     includeInKids: 'true',
     includeInGames: 'true',
-    visibility: isAssistant ? TEAM : PUBLIC,
+    visibility: PUBLIC,
     hideOverlay: 'false',
   }
 
@@ -194,11 +185,7 @@ function SongCrudPresentation({
             />
           </div>
           <div className="col-span-12">
-            <Form.Visibility
-              control={control}
-              errors={errors}
-              reduceAssistantOptions={isAssistant}
-            />
+            <Form.Visibility control={control} errors={errors} />
           </div>
           <div className="col-span-6">
             <Form.RadioButtons
diff --git a/src/components/StoryAudienceCrud/StoryAudienceCrudPresentation.js b/src/components/StoryAudienceCrud/StoryAudienceCrudPresentation.js
index fea8efbb6..4359bd5e4 100644
--- a/src/components/StoryAudienceCrud/StoryAudienceCrudPresentation.js
+++ b/src/components/StoryAudienceCrud/StoryAudienceCrudPresentation.js
@@ -6,11 +6,8 @@ import * as yup from 'yup'
 import Form from 'components/Form'
 // import { definitions } from 'common/utils/validationHelpers'
 import useEditForm from 'common/hooks/useEditForm'
-import { PUBLIC, TEAM } from 'common/constants'
+import { PUBLIC } from 'common/constants'
 import StoryCrudStepWrapper from 'components/StoryCrud/StoryCrudStepWrapper'
-import { useParams } from 'react-router-dom'
-import { useUserStore } from 'context/UserContext'
-import { ASSISTANT } from '../../common/constants/roles'
 
 function StoryAudienceCrudPresentation({ dataToEdit, submitHandler }) {
   const validator = yup.object().shape({
@@ -18,14 +15,8 @@ function StoryAudienceCrudPresentation({ dataToEdit, submitHandler }) {
     includeInKids: yup.string(),
   })
 
-  const { sitename } = useParams()
-  const { user } = useUserStore()
-  const userRoles = user?.roles || {}
-  const userSiteRole = userRoles?.[sitename] || ''
-  const isAssistant = userSiteRole === ASSISTANT
-
   const defaultValues = {
-    visibility: isAssistant ? TEAM : PUBLIC,
+    visibility: PUBLIC,
     includeInKids: 'true',
   }
 
@@ -46,11 +37,7 @@ function StoryAudienceCrudPresentation({ dataToEdit, submitHandler }) {
         <form onReset={reset}>
           <div className="grid grid-cols-12 gap-8 p-8">
             <div className="col-span-12">
-              <Form.Visibility
-                control={control}
-                errors={errors}
-                reduceAssistantOptions={isAssistant}
-              />
+              <Form.Visibility control={control} errors={errors} />
             </div>
             <div className="col-span-6">
               <Form.RadioButtons