diff --git a/framework/core/src/Core/Handlers/Commands/UploadAvatarCommandHandler.php b/framework/core/src/Core/Handlers/Commands/UploadAvatarCommandHandler.php
index 3b0e5c4fa..6e94070a1 100644
--- a/framework/core/src/Core/Handlers/Commands/UploadAvatarCommandHandler.php
+++ b/framework/core/src/Core/Handlers/Commands/UploadAvatarCommandHandler.php
@@ -51,7 +51,7 @@ class UploadAvatarCommandHandler
             'target' => $this->uploadDir,
         ]);
 
-        if ($mount->has($file = "target://$user->avatar_path")) {
+        if ($user->avatar_path && $mount->has($file = "target://$user->avatar_path")) {
             $mount->delete($file);
         }