diff --git a/genesis/src/main.rs b/genesis/src/main.rs
index a12e9cbf5d..31f2f76f20 100644
--- a/genesis/src/main.rs
+++ b/genesis/src/main.rs
@@ -15,7 +15,10 @@ use std::path::Path;
  * - one token for the transaction fee
  * - one second token to keep the node identity public key valid
  */
-pub const BOOTSTRAP_LEADER_TOKENS: u64 = 3;
+//pub const BOOTSTRAP_LEADER_TOKENS: u64 = 3;
+// TODO: Until https://github.com/solana-labs/solana/issues/2355 is resolved the bootstrap leader
+// needs N tokens as its vote account gets re-created on every node restart, costing it tokens
+pub const BOOTSTRAP_LEADER_TOKENS: u64 = 1_000_000;
 
 fn main() -> Result<(), Box<dyn error::Error>> {
     let matches = App::new("solana-genesis")