diff --git a/phpBB/phpbb/avatar/driver/upload.php b/phpBB/phpbb/avatar/driver/upload.php
index 607db9067c..4effa4c410 100644
--- a/phpBB/phpbb/avatar/driver/upload.php
+++ b/phpBB/phpbb/avatar/driver/upload.php
@@ -286,14 +286,15 @@ class upload extends \phpbb\avatar\driver\driver
 			try
 			{
 				$this->filesystem->remove($filename);
+				return true;
 			}
 			catch (\phpbb\filesystem\exception\filesystem_exception $e)
 			{
-				// Do nothing
+				// Fail is covered by return statement below
 			}
 		}
 
-		return true;
+		return false;
 	}
 
 	/**