diff --git a/app/Http/Controllers/Api/ApiV1Controller.php b/app/Http/Controllers/Api/ApiV1Controller.php
index dee9fecdb..d4c994bc5 100644
--- a/app/Http/Controllers/Api/ApiV1Controller.php
+++ b/app/Http/Controllers/Api/ApiV1Controller.php
@@ -49,6 +49,7 @@ use App\Http\Controllers\StatusController;
 use App\Jobs\AvatarPipeline\AvatarOptimize;
 use App\Jobs\CommentPipeline\CommentPipeline;
 use App\Jobs\LikePipeline\LikePipeline;
+use App\Jobs\MediaPipeline\MediaDeletePipeline;
 use App\Jobs\SharePipeline\SharePipeline;
 use App\Jobs\SharePipeline\UndoSharePipeline;
 use App\Jobs\StatusPipeline\NewStatusPipeline;
@@ -96,6 +97,7 @@ use App\Jobs\FollowPipeline\FollowAcceptPipeline;
 use App\Jobs\FollowPipeline\FollowRejectPipeline;
 use Illuminate\Support\Facades\RateLimiter;
 use Purify;
+use Carbon\Carbon;
 
 class ApiV1Controller extends Controller
 {
@@ -1654,11 +1656,11 @@ class ApiV1Controller extends Controller
 		switch ($media->mime) {
 			case 'image/jpeg':
 			case 'image/png':
-				ImageOptimize::dispatch($media);
+				ImageOptimize::dispatch($media)->onQueue('mmo');
 				break;
 
 			case 'video/mp4':
-				VideoThumbnail::dispatch($media);
+				VideoThumbnail::dispatch($media)->onQueue('mmo');
 				$preview_url = '/storage/no-preview.png';
 				$url = '/storage/no-preview.png';
 				break;
@@ -1767,7 +1769,8 @@ class ApiV1Controller extends Controller
 			],
 		  'filter_name' => 'nullable|string|max:24',
 		  'filter_class' => 'nullable|alpha_dash|max:24',
-		  'description' => 'nullable|string|max:' . config_cache('pixelfed.max_altext_length')
+		  'description' => 'nullable|string|max:' . config_cache('pixelfed.max_altext_length'),
+		  'replace_id' => 'sometimes'
 		]);
 
 		$user = $request->user();
@@ -1829,6 +1832,21 @@ class ApiV1Controller extends Controller
 
 		abort_if(MediaBlocklistService::exists($hash) == true, 451);
 
+		if($request->has('replace_id')) {
+			$rpid = $request->input('replace_id');
+			$removeMedia = Media::whereNull('status_id')
+				->whereUserId($user->id)
+				->whereProfileId($profile->id)
+				->where('created_at', '>', now()->subHours(2))
+				->find($rpid);
+			if($removeMedia) {
+				$dateTime = Carbon::now();
+				MediaDeletePipeline::dispatch($removeMedia)
+					->onQueue('mmo')
+					->delay($dateTime->addMinutes(15));
+			}
+		}
+
 		$media = new Media();
 		$media->status_id = null;
 		$media->profile_id = $profile->id;
@@ -1848,11 +1866,11 @@ class ApiV1Controller extends Controller
 		switch ($media->mime) {
 			case 'image/jpeg':
 			case 'image/png':
-				ImageOptimize::dispatch($media);
+				ImageOptimize::dispatch($media)->onQueue('mmo');
 				break;
 
 			case 'video/mp4':
-				VideoThumbnail::dispatch($media);
+				VideoThumbnail::dispatch($media)->onQueue('mmo');
 				$preview_url = '/storage/no-preview.png';
 				$url = '/storage/no-preview.png';
 				break;
diff --git a/app/Http/Controllers/ComposeController.php b/app/Http/Controllers/ComposeController.php
index ad52807c5..8c2c91877 100644
--- a/app/Http/Controllers/ComposeController.php
+++ b/app/Http/Controllers/ComposeController.php
@@ -149,11 +149,11 @@ class ComposeController extends Controller
 			case 'image/jpeg':
 			case 'image/png':
 			case 'image/webp':
-			ImageOptimize::dispatch($media);
+			ImageOptimize::dispatch($media)->onQueue('mmo');
 			break;
 
 			case 'video/mp4':
-			VideoThumbnail::dispatch($media);
+			VideoThumbnail::dispatch($media)->onQueue('mmo');
 			$preview_url = '/storage/no-preview.png';
 			$url = '/storage/no-preview.png';
 			break;
@@ -213,7 +213,7 @@ class ComposeController extends Controller
 		$res = [
 			'url' => $media->url() . '?v=' . time()
 		];
-		ImageOptimize::dispatch($media);
+		ImageOptimize::dispatch($media)->onQueue('mmo');
 		Cache::forget($limitKey);
 		return $res;
 	}
@@ -512,12 +512,7 @@ class ComposeController extends Controller
 			$m->license = $license;
 			$m->caption = isset($media['alt']) ? strip_tags($media['alt']) : null;
 			$m->order = isset($media['cursor']) && is_int($media['cursor']) ? (int) $media['cursor'] : $k;
-			// if($optimize_media == false) {
-			// 	$m->skip_optimize = true;
-			// 	ImageThumbnail::dispatch($m);
-			// } else {
-			// 	ImageOptimize::dispatch($m);
-			// }
+
 			if($cw == true || $profile->cw == true) {
 				$m->is_nsfw = $cw;
 				$status->is_nsfw = $cw;
diff --git a/app/Jobs/ImageOptimizePipeline/ImageOptimize.php b/app/Jobs/ImageOptimizePipeline/ImageOptimize.php
index e7c1b211e..798ffdb75 100644
--- a/app/Jobs/ImageOptimizePipeline/ImageOptimize.php
+++ b/app/Jobs/ImageOptimizePipeline/ImageOptimize.php
@@ -49,6 +49,6 @@ class ImageOptimize implements ShouldQueue
             return;
         }
 
-        ImageResize::dispatch($media);
+        ImageResize::dispatch($media)->onQueue('mmo');
     }
 }
diff --git a/app/Jobs/ImageOptimizePipeline/ImageResize.php b/app/Jobs/ImageOptimizePipeline/ImageResize.php
index 15183c2e1..97278eb75 100644
--- a/app/Jobs/ImageOptimizePipeline/ImageResize.php
+++ b/app/Jobs/ImageOptimizePipeline/ImageResize.php
@@ -55,6 +55,6 @@ class ImageResize implements ShouldQueue
         } catch (Exception $e) {
         }
 
-        ImageThumbnail::dispatch($media);
+        ImageThumbnail::dispatch($media)->onQueue('mmo');
     }
 }
diff --git a/app/Jobs/ImageOptimizePipeline/ImageThumbnail.php b/app/Jobs/ImageOptimizePipeline/ImageThumbnail.php
index 9d1f4d800..a96beb331 100644
--- a/app/Jobs/ImageOptimizePipeline/ImageThumbnail.php
+++ b/app/Jobs/ImageOptimizePipeline/ImageThumbnail.php
@@ -59,6 +59,6 @@ class ImageThumbnail implements ShouldQueue
         $media->processed_at = Carbon::now();
         $media->save();
 
-        ImageUpdate::dispatch($media);
+        ImageUpdate::dispatch($media)->onQueue('mmo');
     }
 }