diff --git a/mod/photos.php b/mod/photos.php
index e026944423..4b6704a719 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -818,21 +818,22 @@ function photos_post(&$a) {
 	$imagedata = @file_get_contents($src);
 
 
-
-	$r = q("select sum(octet_length(data)) as total from photo where uid = %d and scale = 0 and album != 'Contact Photos' ",
-		intval($a->data['user']['uid'])
-	);
-
 	$limit = service_class_fetch($a->data['user']['uid'],'photo_upload_limit');
 
-	if (($limit !== false) && (($r[0]['total'] + strlen($imagedata)) > $limit)) {
-		notice( upgrade_message() . EOL );
-		@unlink($src);
-		$foo = 0;
-		call_hooks('photo_post_end',$foo);
-		killme();
-	}
+	if ($limit) {
+		$r = q("select sum(octet_length(data)) as total from photo where uid = %d and scale = 0 and album != 'Contact Photos' ",
+			intval($a->data['user']['uid'])
+		);
+		$size = $r[0]['total'];
 
+		if (($size + strlen($imagedata)) > $limit) {
+			notice( upgrade_message() . EOL );
+			@unlink($src);
+			$foo = 0;
+			call_hooks('photo_post_end',$foo);
+			killme();
+		}
+	}
 
 	$ph = new Photo($imagedata, $type);
 
diff --git a/mod/wall_attach.php b/mod/wall_attach.php
index 525d3509c1..fc82389741 100644
--- a/mod/wall_attach.php
+++ b/mod/wall_attach.php
@@ -112,23 +112,25 @@ function wall_attach_post(&$a) {
 		killme();
 	}
 
-	$r = q("select sum(octet_length(data)) as total from attach where uid = %d ",
-		intval($page_owner_uid)
-	);
-
 	$limit = service_class_fetch($page_owner_uid,'attach_upload_limit');
 
-	if(($limit !== false) && (($r[0]['total'] + strlen($imagedata)) > $limit)) {
-		$msg = upgrade_message(true);
-		if ($r_json) {
-			echo json_encode(array('error'=>$msg));
-		} else {
-			echo  $msg. EOL ;
-		}
-		@unlink($src);
-		killme();
-	}
+        if ($limit) {
+		$r = q("select sum(octet_length(data)) as total from photo where uid = %d and scale = 0 and album != 'Contact Photos' ",
+			intval($page_owner_uid)
+		);
+		$size = $r[0]['total'];
 
+		if (($size + strlen($imagedata)) > $limit) {
+			$msg = upgrade_message(true);
+			if ($r_json) {
+				echo json_encode(array('error'=>$msg));
+			} else {
+				echo  $msg. EOL ;
+			}
+			@unlink($src);
+			killme();
+		}
+	}
 
 	$filedata = @file_get_contents($src);
 	$mimetype = z_mime_content_type($filename);
diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index eb2a92323a..c789262c64 100644
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -166,21 +166,19 @@ function wall_upload_post(&$a, $desktopmode = true) {
 			intval($page_owner_uid)
 		);
 		$size = $r[0]['total'];
-	} else
-		$size = 0;
 
-	if(($limit !== false) && (($size + strlen($imagedata)) > $limit)) {
-		$msg = upgrade_message(true);
-		if ($r_json) {
-			echo json_encode(array('error'=>$msg));
-		} else {
-			echo  $msg. EOL;
+		if (($size + strlen($imagedata)) > $limit) {
+			$msg = upgrade_message(true);
+			if ($r_json) {
+				echo json_encode(array('error'=>$msg));
+			} else {
+				echo  $msg. EOL;
+			}
+			@unlink($src);
+			killme();
 		}
-		@unlink($src);
-		killme();
 	}
 
-
 	$imagedata = @file_get_contents($src);
 	$ph = new Photo($imagedata, $filetype);