diff --git a/app/javascript/mastodon/features/compose/containers/circle_dropdown_container.js b/app/javascript/mastodon/features/compose/containers/circle_dropdown_container.js
index 958a903e27d760..9e2fb864537570 100644
--- a/app/javascript/mastodon/features/compose/containers/circle_dropdown_container.js
+++ b/app/javascript/mastodon/features/compose/containers/circle_dropdown_container.js
@@ -2,16 +2,11 @@ import { connect } from 'react-redux';
 import CircleDropdown from '../components/circle_dropdown';
 import { changeComposeCircle } from '../../../actions/compose';
 
-const mapStateToProps = state => {
-  let value = state.getIn(['compose', 'circle_id']);
-  value = value === null ? '' : value;
-
-  return {
-    value: value,
-    visible: state.getIn(['compose', 'privacy']) === 'limited',
-    limitedReply: state.getIn(['compose', 'privacy']) === 'limited' && state.getIn(['compose', 'reply_status', 'visibility']) === 'limited',
-  };
-};
+const mapStateToProps = state => ({
+  value: state.getIn(['compose', 'circle_id']) ?? '',
+  visible: state.getIn(['compose', 'privacy']) === 'limited',
+  limitedReply: state.getIn(['compose', 'privacy']) === 'limited' && state.getIn(['compose', 'reply_status', 'visibility']) === 'limited',
+});
 
 const mapDispatchToProps = dispatch => ({