diff --git a/device/constants.go b/device/constants.go
index 15cdac7..1a4b8ea 100644
--- a/device/constants.go
+++ b/device/constants.go
@@ -13,7 +13,7 @@ import (
 
 const (
 	RekeyAfterMessages      = (1 << 60)
-	RejectAfterMessages     = (1 << 64) - (1 << 4) - 1
+	RejectAfterMessages     = (1 << 64) - (1 << 13) - 1
 	RekeyAfterTime          = time.Second * 120
 	RekeyAttemptTime        = time.Second * 90
 	RekeyTimeout            = time.Second * 5
diff --git a/replay/replay.go b/replay/replay.go
index 034273c..e5c7391 100644
--- a/replay/replay.go
+++ b/replay/replay.go
@@ -21,7 +21,7 @@ const (
 const (
 	CounterRedundantBitsLog = _WordLogSize + 3
 	CounterRedundantBits    = _WordSize * 8
-	CounterBitsTotal        = 2048
+	CounterBitsTotal        = 8192
 	CounterWindowSize       = uint64(CounterBitsTotal - CounterRedundantBits)
 )