diff --git a/src/Contact/Avatar.php b/src/Contact/Avatar.php
index be4f564ae0..f165e1d3a1 100644
--- a/src/Contact/Avatar.php
+++ b/src/Contact/Avatar.php
@@ -150,7 +150,7 @@ class Avatar
 			return '';
 		}
 
-		$path = $filename . $size . '.' . $image->getExt();
+		$path = $filename . $size . $image->getExt();
 
 		$basepath = self::basePath();
 		if (empty($basepath)) {
diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index 38743b691d..3d345d2317 100644
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -662,9 +662,9 @@ class Photo
 
 			$suffix = '?ts=' . time();
 
-			$image_url = DI::baseUrl() . '/photo/' . $resource_id . '-4.' . $image->getExt() . $suffix;
-			$thumb = DI::baseUrl() . '/photo/' . $resource_id . '-5.' . $image->getExt() . $suffix;
-			$micro = DI::baseUrl() . '/photo/' . $resource_id . '-6.' . $image->getExt() . $suffix;
+			$image_url = DI::baseUrl() . '/photo/' . $resource_id . '-4' . $image->getExt() . $suffix;
+			$thumb = DI::baseUrl() . '/photo/' . $resource_id . '-5' . $image->getExt() . $suffix;
+			$micro = DI::baseUrl() . '/photo/' . $resource_id . '-6' . $image->getExt() . $suffix;
 		} else {
 			$photo_failure = true;
 		}
diff --git a/src/Module/Settings/Profile/Photo/Crop.php b/src/Module/Settings/Profile/Photo/Crop.php
index ef621b1823..a9988d2830 100644
--- a/src/Module/Settings/Profile/Photo/Crop.php
+++ b/src/Module/Settings/Profile/Photo/Crop.php
@@ -213,7 +213,7 @@ class Crop extends BaseSettings
 
 		DI::page()['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('settings/profile/photo/crop_head.tpl'), []);
 
-		$filename = $imagecrop['resource-id'] . '-' . $imagecrop['scale'] . '.' . $imagecrop['ext'];
+		$filename = $imagecrop['resource-id'] . '-' . $imagecrop['scale'] . $imagecrop['ext'];
 		$tpl = Renderer::getMarkupTemplate('settings/profile/photo/crop.tpl');
 		$o = Renderer::replaceMacros($tpl, [
 			'$filename'  => $filename,
diff --git a/src/Util/Images.php b/src/Util/Images.php
index d9bb369b90..33bae87a79 100644
--- a/src/Util/Images.php
+++ b/src/Util/Images.php
@@ -452,7 +452,7 @@ class Images
 	{
 		return self::getBBCodeByUrl(
 			DI::baseUrl() . '/photos/' . $nickname . '/image/' . $resource_id,
-			DI::baseUrl() . '/photo/' . $resource_id . '-' . $preview. '.' . $ext,
+			DI::baseUrl() . '/photo/' . $resource_id . '-' . $preview. $ext,
 			$description
 		);
 	}