diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/core/features/impl/messaging/AutoSave.kt b/core/src/main/kotlin/me/rhunk/snapenhance/core/features/impl/messaging/AutoSave.kt
index 7ac764ea..1f40e427 100644
--- a/core/src/main/kotlin/me/rhunk/snapenhance/core/features/impl/messaging/AutoSave.kt
+++ b/core/src/main/kotlin/me/rhunk/snapenhance/core/features/impl/messaging/AutoSave.kt
@@ -64,9 +64,8 @@ class AutoSave : MessagingRuleFeature("Auto Save", MessagingRuleType.AUTO_SAVE,
         }
 
         if (context.feature(StealthMode::class).canUseRule(targetConversationId)) return false
-        if (!canUseRule(targetConversationId)) return false
 
-        return true
+        return canUseRule(targetConversationId)
     }
 
     override fun asyncOnActivityCreate() {
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 81ebb9c5..5dd1a3ae 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
@@ -36,7 +36,7 @@ class UnsaveableMessages : MessagingRuleFeature(
                         val contentType = firstOrNull(2)?.value
                         if (contentType != ContentType.STATUS.id.toLong()) {
                             remove(7)
-                            addVarInt(7, 1) // set savePolicy to PROHIBITED
+                            addVarInt(7, if (contentType != ContentType.SNAP.id) 3 else 1) // set savePolicy to PROHIBITED only for snaps
                         }
                     }
                 }.toByteArray()