diff --git a/app/Jobs/AvatarPipeline/RemoteAvatarFetch.php b/app/Jobs/AvatarPipeline/RemoteAvatarFetch.php
index 6a05949e5..d324a51a4 100644
--- a/app/Jobs/AvatarPipeline/RemoteAvatarFetch.php
+++ b/app/Jobs/AvatarPipeline/RemoteAvatarFetch.php
@@ -51,6 +51,10 @@ class RemoteAvatarFetch implements ShouldQueue
 	{
 		$profile = $this->profile;
 
+		if(config('pixelfed.cloud_storage') !== true) {
+			return 1;
+		}
+
 		if($profile->domain == null || $profile->private_key) {
 			return 1;
 		}
diff --git a/app/Util/ActivityPub/Helpers.php b/app/Util/ActivityPub/Helpers.php
index bb3114817..2291b9779 100644
--- a/app/Util/ActivityPub/Helpers.php
+++ b/app/Util/ActivityPub/Helpers.php
@@ -474,7 +474,9 @@ class Helpers {
 					$profile->webfinger = strtolower(Purify::clean($webfinger));
 					$profile->last_fetched_at = now();
 					$profile->save();
-					RemoteAvatarFetch::dispatch($profile);
+					if(config('pixelfed.cloud_storage') == true) {
+						RemoteAvatarFetch::dispatch($profile);
+					}
 					return $profile;
 				});
 			} else {
@@ -488,7 +490,9 @@ class Helpers {
 					$profile->sharedInbox = isset($res['endpoints']) && isset($res['endpoints']['sharedInbox']) && Helpers::validateUrl($res['endpoints']['sharedInbox']) ? $res['endpoints']['sharedInbox'] : null;
 					$profile->save();
 				}
-				RemoteAvatarFetch::dispatch($profile);
+				if(config('pixelfed.cloud_storage') == true) {
+					RemoteAvatarFetch::dispatch($profile);
+				}
 			}
 			return $profile;
 		});