diff --git a/include/api.php b/include/api.php
index 1cb1880b44..69c8ace2bc 100644
--- a/include/api.php
+++ b/include/api.php
@@ -1810,15 +1810,15 @@ function api_statuses_networkpublic_timeline($type)
 
 	$start = max(0, ($page - 1) * $count);
 
-	$condition = ["`uid` = 0 AND `gravity` IN (?, ?) AND `iid` > ? AND `private` = ?",
+	$condition = ["`uid` = 0 AND `gravity` IN (?, ?) AND `id` > ? AND `private` = ?",
 		GRAVITY_PARENT, GRAVITY_COMMENT, $since_id, Item::PUBLIC];
 
 	if ($max_id > 0) {
-		$condition[0] .= " AND `iid` <= ?";
+		$condition[0] .= " AND `id` <= ?";
 		$condition[] = $max_id;
 	}
 
-	$params = ['order' => ['iid' => true], 'limit' => [$start, $count]];
+	$params = ['order' => ['id' => true], 'limit' => [$start, $count]];
 	$statuses = Post::selectForUser(api_user(), Item::DISPLAY_FIELDLIST, $condition, $params);
 
 	$ret = api_format_items(Post::toArray($statuses), $user_info, false, $type);
diff --git a/tests/datasets/api.fixture.php b/tests/datasets/api.fixture.php
index 3e9e531646..407629709d 100644
--- a/tests/datasets/api.fixture.php
+++ b/tests/datasets/api.fixture.php
@@ -320,6 +320,7 @@ return [
 			'parent-uri'  => '1',
 			'thr-parent-id' => 1,
 			'thr-parent'  => '1',
+			'private'     => 0,
 			'gravity'     => GRAVITY_PARENT,
 			'author-link' => 'http://localhost/profile/selfcontact',
 			'wall'        => 1,
@@ -348,6 +349,7 @@ return [
 			'parent-uri'  => '1',
 			'thr-parent-id' => 1,
 			'thr-parent'  => '1',
+			'private'     => 0,
 			'gravity'     => GRAVITY_COMMENT,
 			'author-link' => 'http://localhost/profile/selfcontact',
 			'wall'        => 1,
@@ -372,6 +374,7 @@ return [
 			'parent-uri'  => '3',
 			'thr-parent-id' => 3,
 			'thr-parent'  => '3',
+			'private'     => 0,
 			'gravity'     => GRAVITY_PARENT,
 			'author-link' => 'http://localhost/profile/othercontact',
 			'wall'        => 1,
@@ -397,6 +400,7 @@ return [
 			'parent-uri'  => '1',
 			'thr-parent-id' => 1,
 			'thr-parent'  => '1',
+			'private'     => 0,
 			'gravity'     => GRAVITY_COMMENT,
 			'author-link' => 'http://localhost/profile/othercontact',
 			'wall'        => 1,
@@ -422,6 +426,7 @@ return [
 			'parent-uri'  => '1',
 			'thr-parent-id' => 1,
 			'thr-parent'  => '1',
+			'private'     => 0,
 			'gravity'     => GRAVITY_COMMENT,
 			'author-link' => 'http://localhost/profile/othercontact',
 			'wall'        => 1,
@@ -450,6 +455,7 @@ return [
 			'parent-uri'  => '6',
 			'thr-parent-id' => 6,
 			'thr-parent'  => '6',
+			'private'     => 0,
 			'gravity'     => GRAVITY_PARENT,
 			'author-link' => 'http://localhost/profile/othercontact',
 			'wall'        => 1,