diff --git a/pusher/push_iterator_test.go b/pusher/push_iterator_test.go
index 83e9404..7db49b6 100644
--- a/pusher/push_iterator_test.go
+++ b/pusher/push_iterator_test.go
@@ -433,7 +433,7 @@ var _ = Describe("PushIterator", func() {
 					return err
 				}
 				newExpiration := row.NumericAttributes.Values["$expiration"]
-				Expect(newExpiration).To(Equal(uint64(1200)))
+				Expect(newExpiration).To(Equal(uint64(1600)))
 				return nil
 			})
 			Expect(err).NotTo(HaveOccurred())
diff --git a/sqlitestore.go b/sqlitestore.go
index 8834eaf..c4110cf 100644
--- a/sqlitestore.go
+++ b/sqlitestore.go
@@ -374,13 +374,13 @@ func (s *SQLiteStore) FollowEvents(ctx context.Context, iterator arkivevents.Bat
 
 						oldNumericAttributes := latestPayload.NumericAttributes
 
-						newToBlock := block.Number + operation.ExtendBTL.BTL
+						oldExpiration := oldNumericAttributes.Values["$expiration"]
+
+						newToBlock := oldExpiration + operation.ExtendBTL.BTL
 
 						numericAttributes := maps.Clone(oldNumericAttributes.Values)
 						numericAttributes["$expiration"] = uint64(newToBlock)
 
-						oldExpiration := oldNumericAttributes.Values["$expiration"]
-
 						id, err := st.UpsertPayload(ctx, store.UpsertPayloadParams{
 							EntityKey:         key,
 							Payload:           latestPayload.Payload,
diff --git a/sqlitestore_test.go b/sqlitestore_test.go
index b7e947d..bf0c8f0 100644
--- a/sqlitestore_test.go
+++ b/sqlitestore_test.go
@@ -598,7 +598,7 @@ var _ = Describe("SQLiteStore", func() {
 				row, err := q.GetPayloadForEntityKey(ctx, key.Bytes())
 				Expect(err).NotTo(HaveOccurred())
 				newExpiration := row.NumericAttributes.Values["$expiration"]
-				Expect(newExpiration).To(Equal(uint64(1200))) // 200 + 1000
+				Expect(newExpiration).To(Equal(uint64(1600)))
 
 				// Verify old expiration bitmap is removed
 				oldExpBitmap, err := q.EvaluateNumericAttributeValueEqual(ctx, store.EvaluateNumericAttributeValueEqualParams{
@@ -610,7 +610,7 @@ var _ = Describe("SQLiteStore", func() {
 				// Verify new expiration bitmap exists
 				newExpBitmap, err := q.EvaluateNumericAttributeValueEqual(ctx, store.EvaluateNumericAttributeValueEqualParams{
 					Name:  "$expiration",
-					Value: 1200,
+					Value: 1600,
 				})
 				Expect(err).NotTo(HaveOccurred())
 				Expect(newExpBitmap.ToArray()).To(HaveLen(1))