diff --git a/app/Http/Controllers/Api/ApiV1Controller.php b/app/Http/Controllers/Api/ApiV1Controller.php
index 26bb0dd49..5c9f95442 100644
--- a/app/Http/Controllers/Api/ApiV1Controller.php
+++ b/app/Http/Controllers/Api/ApiV1Controller.php
@@ -1289,13 +1289,17 @@ class ApiV1Controller extends Controller
 		if($max) {
 			$res = NotificationService::getMax($pid, $max, $limit);
 			$ids = NotificationService::getRankedMaxId($pid, $max, $limit);
-			$maxId = max($ids);
-			$minId = min($ids);
+			if(!empty($ids)) {
+				$maxId = max($ids);
+				$minId = min($ids);
+			}
 		} else {
 			$res = NotificationService::getMin($pid, $min ?? $since, $limit);
 			$ids = NotificationService::getRankedMinId($pid, $min ?? $since, $limit);
-			$maxId = max($ids);
-			$minId = min($ids);
+			if(!empty($ids)) {
+				$maxId = max($ids);
+				$minId = min($ids);
+			}
 		}
 
 		$baseUrl = config('app.url') . '/api/v1/notifications?';
diff --git a/app/Http/Controllers/PublicApiController.php b/app/Http/Controllers/PublicApiController.php
index 15e50feb8..fd8dae9ce 100644
--- a/app/Http/Controllers/PublicApiController.php
+++ b/app/Http/Controllers/PublicApiController.php
@@ -402,8 +402,8 @@ class PublicApiController extends Controller
         }
 
         $filtered = $user ? UserFilterService::filters($user->profile_id) : [];
-        $textOnlyPosts = Redis::zscore('pf:tl:top', $pid) !== false;
-        $textOnlyReplies = Redis::zscore('pf:tl:replies', $pid) !== false;
+        $textOnlyPosts = (bool) Redis::zscore('pf:tl:top', $pid);
+        $textOnlyReplies = (bool) Redis::zscore('pf:tl:replies', $pid);
         $types = $textOnlyPosts ?
         	['text', 'photo', 'photo:album', 'video', 'video:album', 'photo:video:album'] :
         	['photo', 'photo:album', 'video', 'video:album', 'photo:video:album'];
diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
index 5f53fc727..65dfca5d0 100644
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -241,13 +241,13 @@ class SettingsController extends Controller
 		if($top) {
 			Redis::zadd('pf:tl:top', $pid, $pid);
 		} else {
-			Redis::zrem('pf:tl:top', $pid, $pid);
+			Redis::zrem('pf:tl:top', $pid);
 		}
 
 		if($replies) {
 			Redis::zadd('pf:tl:replies', $pid, $pid);
 		} else {
-			Redis::zrem('pf:tl:replies', $pid, $pid);
+			Redis::zrem('pf:tl:replies', $pid);
 		}
 		return redirect(route('settings.timeline'));
 	}