diff --git a/safekeeper/src/send_wal.rs b/safekeeper/src/send_wal.rs
index a6b9de2050..7439d6a8f6 100644
--- a/safekeeper/src/send_wal.rs
+++ b/safekeeper/src/send_wal.rs
@@ -199,9 +199,8 @@ impl ReplicationConn {
 
         runtime.block_on(async move {
             let (_, persisted_state) = spg.timeline.get().get_state();
-            if persisted_state.server.wal_seg_size == 0
-                || persisted_state.timeline_start_lsn == Lsn(0)
-            {
+            // add persisted_state.timeline_start_lsn == Lsn(0) check
+            if persisted_state.server.wal_seg_size == 0 {
                 bail!("Cannot start replication before connecting to walproposer");
             }
 
diff --git a/safekeeper/src/wal_storage.rs b/safekeeper/src/wal_storage.rs
index 5cfc96c84b..5cb7a8c758 100644
--- a/safekeeper/src/wal_storage.rs
+++ b/safekeeper/src/wal_storage.rs
@@ -531,10 +531,8 @@ impl WalReader {
             );
         }
 
-        if state.server.wal_seg_size == 0
-            || state.timeline_start_lsn == Lsn(0)
-            || state.local_start_lsn == Lsn(0)
-        {
+        // TODO: add state.timeline_start_lsn == Lsn(0) check
+        if state.server.wal_seg_size == 0 || state.local_start_lsn == Lsn(0) {
             bail!("state uninitialized, no data to read");
         }