diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js
index c102c6eb..06c9ceba 100644
--- a/src/store/modules/settings.js
+++ b/src/store/modules/settings.js
@@ -95,6 +95,9 @@ const settings = {
       if (key === 'Pleroma.Emails.Mailer' && input === ':adapter') {
         const subkeys = Object.keys(state.settings[group][key]).filter(el => el !== ':adapter')
         await removeSettings([{ group, key, delete: true, subkeys }], getters.authHost, getters.token)
+      } else if (key === 'Pleroma.Upload' && input === ':uploader') {
+        const deletedKey = value === 'Pleroma.Uploaders.Local' ? 'Pleroma.Uploaders.S3' : 'Pleroma.Uploaders.Local'
+        await removeSettings([{ group, key: deletedKey, delete: true }], getters.authHost, getters.token)
       }
       key
         ? commit('UPDATE_STATE', { group, key, input, value })
diff --git a/src/views/settings/components/Upload.vue b/src/views/settings/components/Upload.vue
index 0d4d5a21..a9a57619 100644
--- a/src/views/settings/components/Upload.vue
+++ b/src/views/settings/components/Upload.vue
@@ -3,14 +3,17 @@
     <el-form ref="uploadData" :model="uploadData" :label-width="labelWidth">
       <setting :setting-group="upload" :data="uploadData"/>
     </el-form>
-    <el-form ref="uploadersLocal" :model="uploadersLocalData" :label-width="labelWidth">
+    <el-form v-if="showUploadersLocal" ref="uploadersLocal" :model="uploadersLocalData" :label-width="labelWidth">
+      <el-form-item class="description-container description">
+        <span class="description"><p>Pleroma.Uploaders.Local</p></span>
+      </el-form-item>
       <setting :setting-group="uploadersLocal" :data="uploadersLocalData"/>
+      <div class="line"/>
     </el-form>
-    <div class="line"/>
-    <el-form ref="uploadersS3" :model="uploadersS3Data" :label-width="labelWidth">
+    <el-form v-if="showUploadersS3" ref="uploadersS3" :model="uploadersS3Data" :label-width="labelWidth">
       <setting :setting-group="uploadersS3" :data="uploadersS3Data"/>
+      <div class="line"/>
     </el-form>
-    <div class="line"/>
     <el-form ref="uploadFilterMogrify" :model="uploadFilterMogrifyData" :label-width="labelWidth">
       <setting :setting-group="uploadFilterMogrify" :data="uploadFilterMogrifyData"/>
     </el-form>
@@ -46,6 +49,14 @@ export default {
     loading() {
       return this.settings.loading
     },
+    showUploadersS3() {
+      const uploader = _.get(this.settings.settings, [':pleroma', 'Pleroma.Upload', ':uploader'])
+      return uploader === 'Pleroma.Uploaders.S3'
+    },
+    showUploadersLocal() {
+      const uploader = _.get(this.settings.settings, [':pleroma', 'Pleroma.Upload', ':uploader'])
+      return uploader === 'Pleroma.Uploaders.Local'
+    },
     upload() {
       return this.settings.description.find(setting => setting.key === 'Pleroma.Upload')
     },