diff --git a/pageserver/src/page_service.rs b/pageserver/src/page_service.rs
index fc8205284a..b5395ecc23 100644
--- a/pageserver/src/page_service.rs
+++ b/pageserver/src/page_service.rs
@@ -564,6 +564,13 @@ impl PageServerHandler {
 
         // TODO leave clean state on error
 
+        // Flush data to disk, then upload to s3
+        info!("flushing layers");
+        datadir_timeline.tline.checkpoint(CheckpointConfig::Flush)?;
+
+        // TODO Wait for s3 upload to complete
+        // info!("uploading layers");
+
         // Import basebackup provided via CopyData
         info!("importing basebackup");
         pgb.write_message(&BeMessage::CopyInResponse)?;
@@ -602,6 +609,13 @@ impl PageServerHandler {
         let reader = CopyInReader::new(pgb);
         import_wal_from_tar(&mut datadir_timeline, reader, start_lsn, end_lsn)?;
 
+        // Flush data to disk, then upload to s3
+        info!("flushing layers");
+        datadir_timeline.tline.checkpoint(CheckpointConfig::Flush)?;
+
+        // TODO Wait for s3 upload to complete
+        // info!("uploading layers");
+
         info!("done");
         Ok(())
     }