diff --git a/lib/private/Avatar.php b/lib/private/Avatar.php
index cc59ed387f07a..1dec0c8d35060 100644
--- a/lib/private/Avatar.php
+++ b/lib/private/Avatar.php
@@ -137,6 +137,13 @@ public function set ($data) {
 		$this->remove();
 		$file = $this->folder->newFile('avatar.'.$type);
 		$file->putContent($data);
+
+		try {
+			$generated = $this->folder->getFile('generated');
+			$generated->delete();
+		} catch (NotFoundException $e) {
+			//
+		}
 		$this->user->triggerChange('avatar', $file);
 	}