diff --git a/framework/core/src/Core/Handlers/Commands/UploadAvatarCommandHandler.php b/framework/core/src/Core/Handlers/Commands/UploadAvatarCommandHandler.php
index 531d74694..8a499e83e 100644
--- a/framework/core/src/Core/Handlers/Commands/UploadAvatarCommandHandler.php
+++ b/framework/core/src/Core/Handlers/Commands/UploadAvatarCommandHandler.php
@@ -47,7 +47,9 @@ class UploadAvatarCommandHandler
             'target' => $this->uploadDir,
         ]);
 
-        // @todo delete old avatar
+        if ($mount->has($file = "target://$user->avatar_path")) {
+            $mount->delete($file);
+        }
 
         $user->changeAvatarPath($uploadName);