diff --git a/app/Util/ActivityPub/Helpers.php b/app/Util/ActivityPub/Helpers.php
index 2aa67758a..15ce5c9f2 100644
--- a/app/Util/ActivityPub/Helpers.php
+++ b/app/Util/ActivityPub/Helpers.php
@@ -401,7 +401,10 @@ class Helpers {
 			$media->remote_url = $url;
 			$media->mime = $type;
 			$media->save();
-			MediaStoragePipeline::dispatch($media);
+
+			if(config('pixelfed.cloud_storage') == true) {
+				MediaStoragePipeline::dispatch($media);
+			}
 		}
 		
 		$status->viewType();