diff --git a/src/rpu.rs b/src/rpu.rs
index 851452b85a..4d6f5b9935 100644
--- a/src/rpu.rs
+++ b/src/rpu.rs
@@ -25,7 +25,7 @@ pub struct Rpu {
 
 impl Rpu {
     pub fn new<W: Write + Send + 'static>(
-        bank: Bank,
+        bank: Arc<Bank>,
         start_hash: Hash,
         tick_duration: Option<Duration>,
         me: ReplicatedData,
@@ -36,8 +36,6 @@ impl Rpu {
         exit: Arc<AtomicBool>,
         writer: W,
     ) -> Self {
-        let bank = Arc::new(bank);
-
         let packet_recycler = packet::PacketRecycler::default();
         let (packet_sender, packet_receiver) = channel();
         let t_receiver = streamer::receiver(
diff --git a/src/server.rs b/src/server.rs
index 7cdad5fe2e..e9a473ac03 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -29,8 +29,9 @@ impl Server {
         exit: Arc<AtomicBool>,
         writer: W,
     ) -> Self {
+        let bank = Arc::new(bank);
         let rpu = Rpu::new(
-            bank,
+            bank.clone(),
             start_hash,
             tick_duration,
             me,
diff --git a/src/tpu.rs b/src/tpu.rs
index e730f13d70..953d1db6b1 100644
--- a/src/tpu.rs
+++ b/src/tpu.rs
@@ -24,7 +24,7 @@ pub struct Tpu {
 
 impl Tpu {
     pub fn new<W: Write + Send + 'static>(
-        bank: Bank,
+        bank: Arc<Bank>,
         start_hash: Hash,
         tick_duration: Option<Duration>,
         me: ReplicatedData,
@@ -34,8 +34,6 @@ impl Tpu {
         exit: Arc<AtomicBool>,
         writer: W,
     ) -> Self {
-        let bank = Arc::new(bank);
-
         let packet_recycler = packet::PacketRecycler::default();
         let (packet_sender, packet_receiver) = channel();
         let t_receiver = streamer::receiver(