diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/core/features/impl/tweaks/UnsaveableMessages.kt b/core/src/main/kotlin/me/rhunk/snapenhance/core/features/impl/tweaks/UnsaveableMessages.kt
index 2f56ac53..75051db6 100644
--- a/core/src/main/kotlin/me/rhunk/snapenhance/core/features/impl/tweaks/UnsaveableMessages.kt
+++ b/core/src/main/kotlin/me/rhunk/snapenhance/core/features/impl/tweaks/UnsaveableMessages.kt
@@ -34,7 +34,7 @@ class UnsaveableMessages : MessagingRuleFeature(
                 event.buffer = ProtoEditor(event.buffer).apply {
                     edit(4) {
                         val contentType = firstOrNull(2)?.value
-                        if (contentType != ContentType.STATUS.id.toLong() && firstOrNull(4)?.toReader()?.contains(11) != true) {
+                        if (contentType != ContentType.STATUS.id.toLong() && firstOrNull(4)?.toReader()?.contains(11) != true && contentType != null) {
                             remove(7)
                             addVarInt(7, 3) // set savePolicy to VIEW_SESSION except for status and snaps
                         }