diff --git a/Iceshrimp.Backend/Controllers/Mastodon/Streaming/WebSocketConnection.cs b/Iceshrimp.Backend/Controllers/Mastodon/Streaming/WebSocketConnection.cs
index 5ba79b4d..9378e7e0 100644
--- a/Iceshrimp.Backend/Controllers/Mastodon/Streaming/WebSocketConnection.cs
+++ b/Iceshrimp.Backend/Controllers/Mastodon/Streaming/WebSocketConnection.cs
@@ -125,6 +125,13 @@ public sealed class WebSocketConnection(
 
 	public async Task HandleSocketMessageAsync(string payload)
 	{
+		// Akkoma-FE sends a plain ping
+		if (payload == "ping")
+		{
+			await SendMessageAsync("pong");
+			return;
+		}
+
 		StreamingRequestMessage? message = null;
 		try
 		{