diff --git a/app/soapbox/actions/compose.js b/app/soapbox/actions/compose.js
index 9f1555ae9..becb39b81 100644
--- a/app/soapbox/actions/compose.js
+++ b/app/soapbox/actions/compose.js
@@ -236,7 +236,10 @@ export function submitCompose(routerHistory, force = false) {
 
     if (!force && needsDescriptions(state)) {
       dispatch(openModal('MISSING_DESCRIPTION', {
-        onContinue: () => dispatch(submitCompose(routerHistory, true)),
+        onContinue: () => {
+          dispatch(closeModal('MISSING_DESCRIPTION'));
+          dispatch(submitCompose(routerHistory, true));
+        },
       }));
       return;
     }
diff --git a/app/soapbox/features/ui/components/confirmation_modal.js b/app/soapbox/features/ui/components/confirmation_modal.js
index 3f16287ad..ab740a940 100644
--- a/app/soapbox/features/ui/components/confirmation_modal.js
+++ b/app/soapbox/features/ui/components/confirmation_modal.js
@@ -61,7 +61,7 @@ class ConfirmationModal extends React.PureComponent {
         cancelText={<FormattedMessage id='confirmation_modal.cancel' defaultMessage='Cancel' />}
         cancelAction={this.handleCancel}
         secondaryText={secondary}
-        secondaryAction={this.handleSecondary}
+        secondaryAction={this.props.onSecondary && this.handleSecondary}
       >
         <p className='text-gray-600 dark:text-gray-300'>{message}</p>