diff --git a/pkg/cmd/roachtest/tests/cdc.go b/pkg/cmd/roachtest/tests/cdc.go
index 9676ffc9b780..93c81e6401cb 100644
--- a/pkg/cmd/roachtest/tests/cdc.go
+++ b/pkg/cmd/roachtest/tests/cdc.go
@@ -1741,9 +1741,9 @@ func createChangefeed(db *gosql.DB, targets, sinkURL string, args cdcTestArgs) (
 	createStmt := fmt.Sprintf(`CREATE CHANGEFEED FOR %s INTO $1`, targets)
 	extraArgs := []interface{}{sinkURL}
 	if args.whichSink == cloudStorageSink || args.whichSink == webhookSink {
-		createStmt += ` WITH resolved='10s', envelope=wrapped`
+		createStmt += ` WITH resolved='10s', envelope=wrapped, min_checkpoint_frequency='10s'`
 	} else {
-		createStmt += ` WITH resolved`
+		createStmt += ` WITH resolved,  min_checkpoint_frequency='10s'`
 	}
 	if !args.initialScan {
 		createStmt += `, cursor='-1s'`
diff --git a/pkg/roachpb/data.go b/pkg/roachpb/data.go
index 05805865aa8b..36e1fbc1877b 100644
--- a/pkg/roachpb/data.go
+++ b/pkg/roachpb/data.go
@@ -1887,7 +1887,7 @@ func (l *Lease) SafeFormat(w redact.SafePrinter, _ rune) {
 
 // Empty returns true for the Lease zero-value.
 func (l *Lease) Empty() bool {
-	return *l == (Lease{})
+	return l == nil || *l == (Lease{})
 }
 
 // OwnedBy returns whether the given store is the lease owner.
diff --git a/pkg/roachpb/string_test.go b/pkg/roachpb/string_test.go
index 74279eb2489b..a6114a472162 100644
--- a/pkg/roachpb/string_test.go
+++ b/pkg/roachpb/string_test.go
@@ -154,7 +154,7 @@ func TestLeaseString(t *testing.T) {
 		},
 		{
 			lease:    nil,
-			expected: "<nil>",
+			expected: "<empty>",
 		},
 		{
 			lease: &roachpb.Lease{