diff --git a/src/protocols/light_client/components/send_last_state_proof.rs b/src/protocols/light_client/components/send_last_state_proof.rs
index 40d1794..3ee706a 100644
--- a/src/protocols/light_client/components/send_last_state_proof.rs
+++ b/src/protocols/light_client/components/send_last_state_proof.rs
@@ -150,10 +150,10 @@ impl<'a> SendLastStateProofProcess<'a> {
 
         // Check if headers are continuous.
         if reorg_count != 0 {
-            return_if_failed!(check_continuous_headers(&headers[..reorg_count - 1]));
+            return_if_failed!(check_continuous_headers(&headers[..reorg_count]));
         }
         return_if_failed!(check_continuous_headers(
-            &headers[reorg_count + sampled_count..]
+            &headers[(reorg_count + sampled_count)..]
         ));
 
         // Verify MMR proof
@@ -249,6 +249,30 @@ impl<'a> SendLastStateProofProcess<'a> {
                         }
                     } else if reorg_count == 0 {
                         new_last_headers
+                    } else if sampled_count == 0
+                        && check_continuous_headers(&headers[(reorg_count - 1)..=reorg_count])
+                            .is_ok()
+                    {
+                        // At the above part:
+                        // - `reorg_count != 0`, `headers[..reorg_count]` are checked.
+                        // - `headers[(reorg_count + sampled_count)..]` are always checked.
+                        // So, only check `reorg_count - 1` and `reorg_count` is enough to prove
+                        // all header are continuous.
+                        let required_count = last_n_blocks - last_n_count;
+                        let old_last_headers = &headers[..reorg_count];
+                        let old_last_headers_len = old_last_headers.len();
+                        let tmp_headers = old_last_headers
+                            .iter()
+                            .skip(old_last_headers_len.saturating_sub(required_count))
+                            .map(ToOwned::to_owned)
+                            .chain(new_last_headers)
+                            .collect::<Vec<_>>();
+                        debug!("peer {}: reorg but no enough blocks, so all headers should be continuous, \
+                            reorg: {reorg_count}, sampled: {sampled_count}, last_n_calculate: {last_n_count}, \
+                            last_n_real: {}, last_n_param: {last_n_blocks}, original_request: {original_request}",
+                            self.peer_index, tmp_headers.len()
+                        );
+                        tmp_headers
                     } else {
                         // If this branch is reached, the follow conditions must be satisfied:
                         // - No previous prove state.
diff --git a/src/tests/protocols/light_client/send_last_state_proof.rs b/src/tests/protocols/light_client/send_last_state_proof.rs
index 0c217ef..59a71a6 100644
--- a/src/tests/protocols/light_client/send_last_state_proof.rs
+++ b/src/tests/protocols/light_client/send_last_state_proof.rs
@@ -1653,7 +1653,6 @@ async fn reorg_rollback_after_restart_and_last_n_blocks_is_not_enough() {
         last_number: 30,
         rollback_blocks_count: 3,
         last_n_blocks: 20,
-        result: StatusCode::InvalidReorgHeaders,
         restart: true,
         ..Default::default()
     };