diff --git a/app/src/test/kotlin/com/bitchat/android/sync/GossipSyncRequestBudgetTest.kt b/app/src/test/kotlin/com/bitchat/android/sync/GossipSyncRequestBudgetTest.kt
new file mode 100644
index 00000000..1def67b9
--- /dev/null
+++ b/app/src/test/kotlin/com/bitchat/android/sync/GossipSyncRequestBudgetTest.kt
@@ -0,0 +1,177 @@
+package com.bitchat.android.sync
+
+import com.bitchat.android.model.RequestSyncPacket
+import com.bitchat.android.protocol.BitchatPacket
+import com.bitchat.android.protocol.MessageType
+import com.bitchat.android.protocol.SpecialRecipients
+import com.bitchat.android.util.AppConstants
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Before
+import org.junit.Test
+
+/**
+ * REQUEST_SYNC is a public packet handled straight off the wire, so an unauthenticated neighbor
+ * decides how often we decode a filter, hash every stored packet, and transmit what it claims to
+ * lack. These cover the budget that bounds that without changing what an honest peer receives.
+ */
+class GossipSyncRequestBudgetTest {
+
+    private companion object {
+        const val CAPACITY = 5
+        const val MY_PEER = "aabbccddeeff0011"
+        const val REQUESTER = "1122334455667788"
+    }
+
+    /** A filter that claims to hold nothing, so every stored packet counts as missing. */
+    private val emptyFilter = RequestSyncPacket(p = 1, m = 1L, data = ByteArray(0))
+
+    private var clock = 1_000_000L
+    private val sentTo = mutableListOf<Pair<String, BitchatPacket>>()
+
+    private lateinit var manager: GossipSyncManager
+
+    private val delegate = object : GossipSyncManager.Delegate {
+        override fun sendPacket(packet: BitchatPacket) = Unit
+        override fun sendPacketToPeer(peerID: String, packet: BitchatPacket) {
+            sentTo.add(peerID to packet)
+        }
+
+        override fun signPacketForBroadcast(packet: BitchatPacket): BitchatPacket = packet
+    }
+
+    private val config = object : GossipSyncManager.ConfigProvider {
+        override fun seenCapacity(): Int = CAPACITY
+        override fun gcsMaxBytes(): Int = 400
+        override fun gcsTargetFpr(): Double = 0.01
+    }
+
+    @Before
+    fun setUp() {
+        sentTo.clear()
+        clock = 1_000_000L
+        manager = GossipSyncManager(
+            myPeerID = MY_PEER,
+            scope = CoroutineScope(Dispatchers.Unconfined),
+            configProvider = config,
+            nowMs = { clock }
+        )
+        manager.delegate = delegate
+    }
+
+    private fun broadcastMessage(body: String): BitchatPacket = BitchatPacket(
+        type = MessageType.MESSAGE.value,
+        senderID = ByteArray(8) { 0x11 },
+        recipientID = SpecialRecipients.BROADCAST,
+        timestamp = clock.toULong(),
+        payload = body.toByteArray(),
+        ttl = 3u
+    )
+
+    private fun storeMessages(count: Int) {
+        repeat(count) { manager.onPublicPacketSeen(broadcastMessage("m$it")) }
+    }
+
+    @Test
+    fun `an honest peer still receives every packet it is missing`() {
+        storeMessages(CAPACITY)
+
+        manager.handleRequestSync(REQUESTER, emptyFilter)
+
+        assertEquals(CAPACITY, sentTo.size)
+        assertTrue(sentTo.all { it.first == REQUESTER })
+    }
+
+    @Test
+    fun `back to back requests stop being serviced after the burst allowance`() {
+        storeMessages(CAPACITY)
+
+        // No time passes between these, so nothing refills.
+        repeat(100) { manager.handleRequestSync(REQUESTER, emptyFilter) }
+
+        // Before the fix every one of the 100 requests replayed all CAPACITY packets.
+        assertEquals(CAPACITY, sentTo.size)
+    }
+
+    @Test
+    fun `a flood cannot pull more packets than the refill window allows`() {
+        storeMessages(CAPACITY)
+
+        // Hammer for a simulated minute, far faster than any honest peer syncs.
+        repeat(600) {
+            clock += 100L
+            manager.handleRequestSync(REQUESTER, emptyFilter)
+        }
+
+        // 60s of hammering earns two windows' worth of packets, not 600 replays.
+        val windows = 60_000L / AppConstants.Sync.RESPONSE_REFILL_WINDOW_MS
+        assertTrue(
+            "sent ${sentTo.size} packets, expected at most ${CAPACITY * (windows + 1)}",
+            sentTo.size <= CAPACITY * (windows + 1)
+        )
+        assertTrue("honest sync must still make progress", sentTo.isNotEmpty())
+    }
+
+    @Test
+    fun `the budget refills so a peer can keep syncing`() {
+        storeMessages(CAPACITY)
+
+        manager.handleRequestSync(REQUESTER, emptyFilter)
+        assertEquals(CAPACITY, sentTo.size)
+
+        sentTo.clear()
+        clock += AppConstants.Sync.RESPONSE_REFILL_WINDOW_MS
+        manager.handleRequestSync(REQUESTER, emptyFilter)
+
+        assertEquals(CAPACITY, sentTo.size)
+    }
+
+    @Test
+    fun `one flooding peer does not consume another peer's budget`() {
+        storeMessages(CAPACITY)
+        repeat(50) { manager.handleRequestSync(REQUESTER, emptyFilter) }
+        sentTo.clear()
+
+        manager.handleRequestSync("99aabbccddeeff00", emptyFilter)
+
+        assertEquals(CAPACITY, sentTo.size)
+    }
+
+    @Test
+    fun `requester bookkeeping stays bounded when peer ids are spoofed`() {
+        storeMessages(1)
+
+        repeat(AppConstants.Sync.MAX_TRACKED_REQUESTERS * 4) { i ->
+            manager.handleRequestSync("%016x".format(i), emptyFilter)
+        }
+
+        assertEquals(
+            AppConstants.Sync.MAX_TRACKED_REQUESTERS,
+            manager.trackedRequesterCount()
+        )
+    }
+
+    @Test
+    fun `a backwards clock jump does not hand out free budget`() {
+        storeMessages(CAPACITY)
+
+        repeat(100) {
+            clock -= 5_000L
+            manager.handleRequestSync(REQUESTER, emptyFilter)
+        }
+
+        assertEquals(CAPACITY, sentTo.size)
+    }
+
+    @Test
+    fun `clearing sync state also clears the budgets`() {
+        storeMessages(CAPACITY)
+        manager.handleRequestSync(REQUESTER, emptyFilter)
+
+        manager.clear()
+
+        assertEquals(0, manager.trackedRequesterCount())
+    }
+}