diff --git a/Iceshrimp.Backend/Core/Extensions/QueryableExtensions.cs b/Iceshrimp.Backend/Core/Extensions/QueryableExtensions.cs
index 2836b70e..60601a9b 100644
--- a/Iceshrimp.Backend/Core/Extensions/QueryableExtensions.cs
+++ b/Iceshrimp.Backend/Core/Extensions/QueryableExtensions.cs
@@ -536,9 +536,9 @@ public static class QueryableExtensions
 	)
 	{
 		if (request.ExcludeReplies)
-			query = query.Where(p => p.Reply == null || p.ReplyUserId == p.UserId);
+			query = query.Where(p => p.Reply == null && p.ReplyUri == null || p.ReplyUserId == p.UserId);
 		if (request.ExcludeRenotes)
-			query = query.Where(p => p.Renote == null);
+			query = query.Where(p => p.Renote == null && p.RenoteUri == null);
 		if (request.Tagged != null)
 			query = query.Where(p => p.Tags.Contains(request.Tagged.ToLowerInvariant()));
 		if (request.OnlyMedia)