diff --git a/Iceshrimp.Backend/Core/Services/NoteService.cs b/Iceshrimp.Backend/Core/Services/NoteService.cs
index f448c3c7..b183fcfd 100644
--- a/Iceshrimp.Backend/Core/Services/NoteService.cs
+++ b/Iceshrimp.Backend/Core/Services/NoteService.cs
@@ -123,7 +123,11 @@ public class NoteService(
 		// ReSharper restore EntityFramework.UnsupportedServerSideFunctionCall
 
 		List<MfmNode>? nodes = null;
-		if (text != null)
+		if (text != null && string.IsNullOrWhiteSpace(text))
+		{
+			text = null;
+		}
+		else if (text != null)
 		{
 			nodes = MfmParser.Parse(text).ToList();
 			nodes = mentionsResolver.ResolveMentions(nodes, user.Host, mentions, splitDomainMapping).ToList();
@@ -402,7 +406,11 @@ public class NoteService(
 
 
 		List<MfmNode>? nodes = null;
-		if (text != null)
+		if (text != null && string.IsNullOrWhiteSpace(text))
+		{
+			text = null;
+		}
+		else if (text != null)
 		{
 			nodes = MfmParser.Parse(text).ToList();
 			nodes = mentionsResolver.ResolveMentions(nodes, note.User.Host, mentions, splitDomainMapping).ToList();