diff --git a/src/Module/Api/Mastodon/Accounts/Statuses.php b/src/Module/Api/Mastodon/Accounts/Statuses.php
index 463411745..4ee6ae66c 100644
--- a/src/Module/Api/Mastodon/Accounts/Statuses.php
+++ b/src/Module/Api/Mastodon/Accounts/Statuses.php
@@ -31,6 +31,7 @@ use Friendica\Model\Item;
 use Friendica\Model\Post;
 use Friendica\Model\Verb;
 use Friendica\Module\BaseApi;
+use Friendica\Object\Api\Mastodon\TimelineOrderByTypes;
 use Friendica\Protocol\Activity;
 
 /**
@@ -56,19 +57,18 @@ class Statuses extends BaseApi
 
 		$request = $this->getRequest([
 			'only_media'      => false, // Show only statuses with media attached? Defaults to false.
-			'max_id'          => 0,     // Return results older than this id
-			'since_id'        => 0,     // Return results newer than this id
-			'min_id'          => 0,     // Return results immediately newer than this id
+			'max_id'          => null,     // Return results older than this id
+			'since_id'        => null,     // Return results newer than this id
+			'min_id'          => null,     // Return results immediately newer than this id
 			'limit'           => 20,    // Maximum number of results to return. Defaults to 20.
 			'pinned'          => false, // Only pinned posts
 			'exclude_replies' => false, // Don't show comments
 			'with_muted'      => false, // Pleroma extension: return activities by muted (not by blocked!) users.
 			'exclude_reblogs' => false, // Undocumented parameter
 			'tagged'          => false, // Undocumented parameter
+			'friendica_order' => TimelineOrderByTypes::ID, // order options (defaults to ID)
 		], $request);
 
-		$params = ['order' => ['uri-id' => true], 'limit' => $request['limit']];
-
 		if ($request['pinned']) {
 			$condition = ['author-id' => $id, 'private' => [Item::PUBLIC, Item::UNLISTED], 'type' => Post\Collection::FEATURED];
 		} elseif ($request['only_media']) {
@@ -80,6 +80,9 @@ class Statuses extends BaseApi
 			$condition = ["`author-id` = ? AND (`uid` = 0 OR (`uid` = ? AND NOT `global`))", $id, $uid];
 		}
 
+		$condition = $this->addPagingConditions($request, $condition);
+		$params = $this->buildOrderAndLimitParams($request);
+
 		if (!$request['pinned'] && !$request['only_media']) {
 			if ($request['exclude_replies']) {
 				$condition = DBA::mergeConditions($condition, ["(`gravity` = ? OR (`gravity` = ? AND `vid` = ? AND `protocol` != ?))",
@@ -92,19 +95,6 @@ class Statuses extends BaseApi
 			$condition = DBA::mergeConditions($condition, ['gravity' => Item::GRAVITY_PARENT]);
 		}
 
-		if (!empty($request['max_id'])) {
-			$condition = DBA::mergeConditions($condition, ["`uri-id` < ?", $request['max_id']]);
-		}
-
-		if (!empty($request['since_id'])) {
-			$condition = DBA::mergeConditions($condition, ["`uri-id` > ?", $request['since_id']]);
-		}
-
-		if (!empty($request['min_id'])) {
-			$condition = DBA::mergeConditions($condition, ["`uri-id` > ?", $request['min_id']]);
-			$params['order'] = ['uri-id'];
-		}
-
 		if ($request['pinned']) {
 			$items = DBA::select('collection-view', ['uri-id'], $condition, $params);
 		} elseif ($request['only_media']) {
@@ -117,11 +107,12 @@ class Statuses extends BaseApi
 
 		$statuses = [];
 		while ($item = Post::fetch($items)) {
-			self::setBoundaries($item['uri-id']);
 			try {
-				$statuses[] = DI::mstdnStatus()->createFromUriId($item['uri-id'], $uid, $display_quotes);
-			} catch (\Exception $exception) {
-				Logger::info('Post not fetchable', ['uri-id' => $item['uri-id'], 'uid' => $uid, 'exception' => $exception]);
+				$status =  DI::mstdnStatus()->createFromUriId($item['uri-id'], $uid, $display_quotes);
+				$this->updateBoundaries($status, $item, $request['friendica_order']);
+				$statuses[] = $status;
+			} catch (\Throwable $th) {
+				Logger::info('Post not fetchable', ['uri-id' => $item['uri-id'], 'uid' => $uid, 'error' => $th]);
 			}
 		}
 		DBA::close($items);
@@ -130,7 +121,7 @@ class Statuses extends BaseApi
 			$statuses = array_reverse($statuses);
 		}
 
-		self::setLinkHeader();
+		self::setLinkHeader($request['friendica_order'] != TimelineOrderByTypes::ID);
 		System::jsonExit($statuses);
 	}
 }
diff --git a/src/Module/Api/Mastodon/Timelines/ListTimeline.php b/src/Module/Api/Mastodon/Timelines/ListTimeline.php
index eeffeba88..7f1d38c5c 100644
--- a/src/Module/Api/Mastodon/Timelines/ListTimeline.php
+++ b/src/Module/Api/Mastodon/Timelines/ListTimeline.php
@@ -104,7 +104,7 @@ class ListTimeline extends BaseApi
 			$statuses = array_reverse($statuses);
 		}
 
-		self::setLinkHeader();
+		self::setLinkHeader($request['friendica_order'] != TimelineOrderByTypes::ID);
 		System::jsonExit($statuses);
 	}
 }
diff --git a/src/Module/Api/Mastodon/Timelines/PublicTimeline.php b/src/Module/Api/Mastodon/Timelines/PublicTimeline.php
index 1f58a6a69..fa93d90c8 100644
--- a/src/Module/Api/Mastodon/Timelines/PublicTimeline.php
+++ b/src/Module/Api/Mastodon/Timelines/PublicTimeline.php
@@ -101,7 +101,7 @@ class PublicTimeline extends BaseApi
 			$statuses = array_reverse($statuses);
 		}
 
-		self::setLinkHeader();
+		self::setLinkHeader($request['friendica_order'] != TimelineOrderByTypes::ID);
 		System::jsonExit($statuses);
 	}
 }