diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
index 5fff21bda..ea1891da5 100644
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@@ -242,6 +242,8 @@
         :preserve-focus="!mobileLayout"
         :auto-focus="!mobileLayout"
         disable-quotes
+        disable-lock-warning
+        disable-notice
         mentions-line
         mentions-line-read-only
         @posted="onPosted"
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index aef20e0cc..c47e08a8b 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -74,7 +74,7 @@
           </a>
         </p>
         <p
-          v-else-if="newStatus.visibility === 'direct'"
+          v-else-if="!hideScopeNotice && newStatus.visibility === 'direct'"
           class="visibility-notice notice-dismissible"
         >
           <span v-if="safeDMEnabled">{{ $t('post_status.direct_warning_to_first_only') }}</span>