diff --git a/Backend/Remora.Discord.API/Json/Converters/Internal/HeartbeatConverter.cs b/Backend/Remora.Discord.API/Json/Converters/Internal/HeartbeatConverter.cs
index db6823d553..5f50881456 100644
--- a/Backend/Remora.Discord.API/Json/Converters/Internal/HeartbeatConverter.cs
+++ b/Backend/Remora.Discord.API/Json/Converters/Internal/HeartbeatConverter.cs
@@ -31,6 +31,9 @@ namespace Remora.Discord.API.Json;
 /// <inheritdoc />
 internal class HeartbeatConverter : JsonConverter<IHeartbeat?>
 {
+    /// <inheritdoc />
+    public override bool HandleNull => true;
+
     /// <inheritdoc />
     public override IHeartbeat Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
diff --git a/Tests/Remora.Discord.Tests/Samples/Gateway/Bidirectional/HEARTBEAT/HEARTBEAT.nulls.json b/Tests/Remora.Discord.Tests/Samples/Gateway/Bidirectional/HEARTBEAT/HEARTBEAT.nulls.json
new file mode 100644
index 0000000000..71341f77a4
--- /dev/null
+++ b/Tests/Remora.Discord.Tests/Samples/Gateway/Bidirectional/HEARTBEAT/HEARTBEAT.nulls.json
@@ -0,0 +1,4 @@
+{
+    "op": 1,
+    "d": null
+}