diff --git a/app/javascript/mastodon/features/compose/components/visibility_button.tsx b/app/javascript/mastodon/features/compose/components/visibility_button.tsx
index 2117fb9035ef28..cc6e667f079872 100644
--- a/app/javascript/mastodon/features/compose/components/visibility_button.tsx
+++ b/app/javascript/mastodon/features/compose/components/visibility_button.tsx
@@ -166,13 +166,17 @@ const searchabilityOptions = {
 const PrivacyModalButton: FC<PrivacyDropdownProps> = ({ disabled = false }) => {
   const intl = useIntl();
 
-  const { visibility, searchability, quotePolicy, circleId } = useAppSelector(
-    (state) => ({
-      visibility: state.compose.get('privacy') as StatusVisibility,
-      searchability: state.compose.get('searchability') as StatusSearchability,
-      quotePolicy: state.compose.get('quote_policy') as ApiQuotePolicy,
-      circleId: state.compose.get('circle_id') as string,
-    }),
+  const quotePolicy = useAppSelector(
+    (state) => state.compose.get('quote_policy') as ApiQuotePolicy,
+  );
+  const visibility = useAppSelector(
+    (state) => state.compose.get('privacy') as StatusVisibility,
+  );
+  const searchability = useAppSelector(
+    (state) => state.compose.get('searchability') as StatusSearchability,
+  );
+  const circleId = useAppSelector(
+    (state) => state.compose.get('circle_id') as string,
   );
 
   const { icon, iconComponent } = useMemo(() => {
diff --git a/app/javascript/mastodon/features/compose/containers/emoji_picker_dropdown_container.js b/app/javascript/mastodon/features/compose/containers/emoji_picker_dropdown_container.js
index 786d63cea96295..c3e95054e13307 100644
--- a/app/javascript/mastodon/features/compose/containers/emoji_picker_dropdown_container.js
+++ b/app/javascript/mastodon/features/compose/containers/emoji_picker_dropdown_container.js
@@ -37,13 +37,9 @@ const DEFAULTS = [
 const RECENT_SIZE = DEFAULTS.length;
 
 const getFrequentlyUsedEmojis = createSelector([
-  state => { return {
-    emojiCounters: state.getIn(['settings', 'frequentlyUsedEmojis'], ImmutableMap()),
-    reactionDeck: state.get('reaction_deck', ImmutableList()),
-  }; },
-], data => {
-  const { emojiCounters, reactionDeck } = data;
-
+  state => state.getIn(['settings', 'frequentlyUsedEmojis'], ImmutableMap()),
+  state => state.get('reaction_deck', ImmutableList()),
+], (emojiCounters, reactionDeck) => {
   let deckEmojis = reactionDeck
     .toArray()
     .map((e) => e.get('name'))