diff --git a/mod/photos.php b/mod/photos.php
index 4436da5d69..14eb88ac95 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -656,10 +656,6 @@ function photos_post(App $a)
 
 	$maximagesize = Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize'));
 
-	if ($maximagesize == 0) {
-		$maximagesize = INF;
-	}
-
 	if ($maximagesize && ($filesize > $maximagesize)) {
 		DI::sysmsg()->addNotice(DI::l10n()->t('Image exceeds size limit of %s', Strings::formatBytes($maximagesize)));
 		@unlink($src);
diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index 1250ad570b..126bc152b4 100644
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -577,11 +577,7 @@ class Photo
 			$filesize = strlen($image->asString());
 			$maximagesize = Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize'));
 
-			if ($maximagesize == 0) {
-				$maximagesize = INF;
-			}
-
-			if (!empty($maximagesize) && ($filesize > $maximagesize)) {
+			if ($maximagesize && ($filesize > $maximagesize)) {
 				Logger::info('Avatar exceeds image limit', ['uid' => $uid, 'cid' => $cid, 'maximagesize' => $maximagesize, 'size' => $filesize, 'type' => $image->getType()]);
 				if ($image->getType() == 'image/gif') {
 					$image->toStatic();
@@ -973,11 +969,7 @@ class Photo
 
 		$maximagesize = Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize'));
 
-		if ($maximagesize == 0) {
-			$maximagesize = INF;
-		}
-
-		if (!empty($maximagesize) && ($filesize > $maximagesize)) {
+		if ($maximagesize && ($filesize > $maximagesize)) {
 			// Scale down to multiples of 640 until the maximum size isn't exceeded anymore
 			foreach ([5120, 2560, 1280, 640] as $pixels) {
 				if (($filesize > $maximagesize) && (max($width, $height) > $pixels)) {
diff --git a/src/Module/Media/Photo/Upload.php b/src/Module/Media/Photo/Upload.php
index ec8dbcf70d..885aa86147 100644
--- a/src/Module/Media/Photo/Upload.php
+++ b/src/Module/Media/Photo/Upload.php
@@ -171,11 +171,7 @@ class Upload extends \Friendica\BaseModule
 
 		$maximagesize = Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize'));
 
-		if ($maximagesize == 0) {
-			$maximagesize = INF;
-		}
-
-		if (!empty($maximagesize) && $filesize > $maximagesize) {
+		if ($maximagesize && $filesize > $maximagesize) {
 			// Scale down to multiples of 640 until the maximum size isn't exceeded anymore
 			foreach ([5120, 2560, 1280, 640] as $pixels) {
 				if ($filesize > $maximagesize && max($width, $height) > $pixels) {
diff --git a/src/Module/Settings/Profile/Photo/Index.php b/src/Module/Settings/Profile/Photo/Index.php
index ee551f88bc..26caae9650 100644
--- a/src/Module/Settings/Profile/Photo/Index.php
+++ b/src/Module/Settings/Profile/Photo/Index.php
@@ -55,10 +55,6 @@ class Index extends BaseSettings
 
 		$maximagesize = Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize', 0));
 
-		if ($maximagesize == 0) {
-			$maximagesize = INF;
-		}
-
 		if ($maximagesize && $filesize > $maximagesize) {
 			DI::sysmsg()->addNotice(DI::l10n()->t('Image exceeds size limit of %s', Strings::formatBytes($maximagesize)));
 			@unlink($src);