diff --git a/include/conversation.php b/include/conversation.php
index 90b5da5994..5a26700fd7 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -491,6 +491,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
 			}
 		}
 	} elseif ($mode === 'notes') {
+		$items = conversation_add_children($items, false, $order, $uid);
 		$profile_owner = local_user();
 
 		if (!$update) {
diff --git a/mod/notes.php b/mod/notes.php
index 608d01cf8c..68a870e9d6 100644
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -65,26 +65,13 @@ function notes_content(App $a, $update = false)
 
 	$params = ['order' => ['created' => true],
 		'limit' => [$a->pager['start'], $a->pager['itemspage']]];
-	$r = Item::selectForUser(local_user(), ['id'], $condition, $params);
+	$r = Item::selectThreadForUser(local_user(), ['uri'], $condition, $params);
 
 	$count = 0;
 
 	if (DBA::isResult($r)) {
 		$count = count($r);
-		$parents_arr = [];
-
-		while ($rr = Item::fetch($r)) {
-			$parents_arr[] = $rr['id'];
-		}
-		DBA::close($r);
-
-		$condition = ['uid' => local_user(), 'parent' => $parents_arr];
-		$result = Item::selectForUser(local_user(), [], $condition);
-
-		if (DBA::isResult($result)) {
-			$items = conv_sort(Item::inArray($result), 'commented');
-			$o .= conversation($a, $items, 'notes', $update);
-		}
+		$o .= conversation($a, DBA::toArray($r), 'notes', $update);
 	}
 
 	$o .= alt_pager($a, $count);