diff --git a/app/Profile.php b/app/Profile.php
index 5c8d2ccbf..a7e4eff26 100644
--- a/app/Profile.php
+++ b/app/Profile.php
@@ -178,6 +178,14 @@ class Profile extends Model
 				return url('/storage/avatars/default.jpg');
 			}
 
+			if( $avatar->is_remote &&
+				$avatar->remote_url &&
+				boolval(config_cache('pixelfed.cloud_storage')) == false &&
+				boolval(config_cache('federation.avatars.store_local')) == true
+			) {
+				return $avatar->remote_url;
+			}
+
 			if($path === 'public/avatars/default.jpg') {
 				return url('/storage/avatars/default.jpg');
 			}