diff --git a/src/views/settings/components/MediaProxy.vue b/src/views/settings/components/MediaProxy.vue
index d3fa619d..701a28ff 100644
--- a/src/views/settings/components/MediaProxy.vue
+++ b/src/views/settings/components/MediaProxy.vue
@@ -4,6 +4,10 @@
       <setting :setting-group="mediaProxy" :data="mediaProxyData"/>
     </el-form>
     <el-divider v-if="mediaProxy" class="divider thick-line"/>
+    <el-form v-if="!loading" :model="mediaPreviewProxyData" :label-position="labelPosition" :label-width="labelWidth">
+      <setting :setting-group="mediaPreviewProxy" :data="mediaPreviewProxyData"/>
+    </el-form>
+    <el-divider v-if="mediaPreviewProxy" class="divider thick-line"/>
     <el-form v-if="!loading" :model="httpInvalidationData" :label-position="labelPosition" :label-width="labelWidth">
       <setting :setting-group="httpInvalidation" :data="httpInvalidationData"/>
     </el-form>
@@ -60,6 +64,12 @@ export default {
     loading() {
       return this.settings.loading
     },
+    mediaPreviewProxy() {
+      return this.settings.description.find(setting => setting.key === ':media_preview_proxy')
+    },
+    mediaPreviewProxyData() {
+      return _.get(this.settings.settings, [':pleroma', ':media_preview_proxy']) || {}
+    },
     mediaProxy() {
       return this.settings.description.find(setting => setting.key === ':media_proxy')
     },
diff --git a/src/views/settings/components/tabs.js b/src/views/settings/components/tabs.js
index 011a16b8..f197cfdc 100644
--- a/src/views/settings/components/tabs.js
+++ b/src/views/settings/components/tabs.js
@@ -34,7 +34,7 @@ export const tabs = description => {
     },
     'job-queue': {
       label: 'settings.jobQueue',
-      settings: ['Pleroma.ActivityExpiration', ':connections_pool', ':hackney_pools', 'Oban', ':pools', ':workers']
+      settings: ['Pleroma.Workers.PurgeExpiredActivity', ':connections_pool', ':hackney_pools', 'Oban', ':pools', ':workers']
     },
     'link-formatter': {
       label: 'settings.linkFormatter',
@@ -50,7 +50,7 @@ export const tabs = description => {
     },
     'media-proxy': {
       label: 'settings.mediaProxy',
-      settings: [':media_proxy', 'Pleroma.Web.MediaProxy.Invalidation.Http', 'Pleroma.Web.MediaProxy.Invalidation.Script']
+      settings: [':media_proxy', ':media_preview_proxy', 'Pleroma.Web.MediaProxy.Invalidation.Http', 'Pleroma.Web.MediaProxy.Invalidation.Script']
     },
     'metadata': {
       label: 'settings.metadata',