diff --git a/apps/server/src/services/tree.ts b/apps/server/src/services/tree.ts
index 71f432395..54013e895 100644
--- a/apps/server/src/services/tree.ts
+++ b/apps/server/src/services/tree.ts
@@ -133,6 +133,9 @@ function sortNotes(parentNoteId: string, customSortBy: string = "title", reverse
             const topBEl = fetchValue(b, "top");
 
             if (topAEl !== topBEl) {
+                if (topAEl === null) return 1;
+                if (topBEl === null) return -1;
+
                 // since "top" should not be reversible, we'll reverse it once more to nullify this effect
                 return compare(topAEl, topBEl) * (reverse ? -1 : 1);
             }
@@ -141,6 +144,9 @@ function sortNotes(parentNoteId: string, customSortBy: string = "title", reverse
             const bottomBEl = fetchValue(b, "bottom");
 
             if (bottomAEl !== bottomBEl) {
+                if (bottomAEl === null) return -1;
+                if (bottomBEl === null) return 1;
+
                 // since "bottom" should not be reversible, we'll reverse it once more to nullify this effect
                 return compare(bottomBEl, bottomAEl) * (reverse ? -1 : 1);
             }