diff --git a/core/routes.php b/core/routes.php
index dd35638a7e..cc1bd34d89 100644
--- a/core/routes.php
+++ b/core/routes.php
@@ -42,7 +42,6 @@ $application->registerRoutes($this, [
 		['name' => 'lost#setPassword', 'url' => '/lostpassword/set/{token}/{userId}', 'verb' => 'POST'],
 		['name' => 'user#getDisplayNames', 'url' => '/displaynames', 'verb' => 'POST'],
 		['name' => 'avatar#getAvatar', 'url' => '/avatar/{userId}/{size}', 'verb' => 'GET'],
-		['name' => 'avatar#getAvatarPng', 'url' => '/avatar/{userId}/{size}/png', 'verb' => 'GET'],
 		['name' => 'avatar#deleteAvatar', 'url' => '/avatar/', 'verb' => 'DELETE'],
 		['name' => 'avatar#postCroppedAvatar', 'url' => '/avatar/cropped', 'verb' => 'POST'],
 		['name' => 'avatar#getTmpAvatar', 'url' => '/avatar/tmp', 'verb' => 'GET'],
diff --git a/lib/private/Avatar.php b/lib/private/Avatar.php
index 270f69a96a..9dbeb4ac74 100644
--- a/lib/private/Avatar.php
+++ b/lib/private/Avatar.php
@@ -301,7 +301,7 @@ class Avatar implements IAvatar {
 	 * Generate png avatar from svg with Imagick
 	 * 
 	 * @param int $size
-	 * @return string
+	 * @return string|boolean
 	 */
 	private function generateAvatarFromSvg(int $size) {
 		if (!extension_loaded('imagick')) {
diff --git a/tests/lib/AvatarTest.php b/tests/lib/AvatarTest.php
index 67fde694b8..759dd38556 100644
--- a/tests/lib/AvatarTest.php
+++ b/tests/lib/AvatarTest.php
@@ -232,7 +232,7 @@ class AvatarTest extends \Test\TestCase {
 	public function testGenerateSvgAvatar() {
 		$avatar = $this->invokePrivate($this->avatar, 'getAvatarVector', [64]);
 		
-		$svg = '
+		$svg = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 		<svg width="64" height="64" version="1.1" viewBox="0 0 500 500" xmlns="http://www.w3.org/2000/svg">
 			<rect width="100%" height="100%" fill="#0082c9"></rect>
 			<text x="50%" y="350" style="font-weight:600;font-size:278px;font-family:\'Open Sans\';text-anchor:middle;fill:#fff">A</text>