diff --git a/changelog.d/.search_config.fix.swp b/changelog.d/.search_config.fix.swp
new file mode 100644
index 000000000..e310fa87e
Binary files /dev/null and b/changelog.d/.search_config.fix.swp differ
diff --git a/changelog.d/notifications-index.fix b/changelog.d/notifications-index.fix
new file mode 100644
index 000000000..4617cbec0
--- /dev/null
+++ b/changelog.d/notifications-index.fix
@@ -0,0 +1 @@
+Fix notifications query which was not using the index properly
diff --git a/lib/pleroma/notification.ex b/lib/pleroma/notification.ex
index 48d467c59..368e609d2 100644
--- a/lib/pleroma/notification.ex
+++ b/lib/pleroma/notification.ex
@@ -88,7 +88,7 @@ def last_read_query(user) do
       where: q.seen == true,
       select: type(q.id, :string),
       limit: 1,
-      order_by: [desc: :id]
+      order_by: fragment("? desc nulls last", q.id)
     )
   end