diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index d73219adc2..ae81bfa6c8 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -261,6 +261,9 @@ const PostStatusForm = {
     uploadFileLimitReached () {
       return this.newStatus.files.length >= this.fileLimit
     },
+    isEdit () {
+      return typeof this.statusId !== 'undefined' && this.statusId.trim() !== ''
+    },
     ...mapGetters(['mergedConfig']),
     ...mapState({
       mobileLayout: state => state.interface.mobileLayout
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 60cab74533..650b5b8c62 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -66,6 +66,14 @@
           <span v-if="safeDMEnabled">{{ $t('post_status.direct_warning_to_first_only') }}</span>
           <span v-else>{{ $t('post_status.direct_warning_to_all') }}</span>
         </p>
+        <p
+          v-if="isEdit"
+          class="visibility-notice"
+        >
+          <span>{{ $t('post_status.edit_remote_warning') }}</span>
+          <br>
+          <span>{{ $t('post_status.edit_unsupported_warning') }}</span>
+        </p>
         <div
           v-if="!disablePreview"
           class="preview-heading faint"
diff --git a/src/i18n/en.json b/src/i18n/en.json
index fa77398222..a303c0e822 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -216,6 +216,8 @@
     "default": "Just landed in L.A.",
     "direct_warning_to_all": "This post will be visible to all the mentioned users.",
     "direct_warning_to_first_only": "This post will only be visible to the mentioned users at the beginning of the message.",
+    "edit_remote_warning": "Other remote instances may not support editing and unable to receive the latest version of your post.",
+    "edit_unsupported_warning": "Pleroma currently does not support editing mentions or polls.",
     "posting": "Posting",
     "post": "Post",
     "preview": "Preview",