diff --git a/blockchain/pool.go b/blockchain/pool.go
index 77428eae8..0be9638bc 100644
--- a/blockchain/pool.go
+++ b/blockchain/pool.go
@@ -131,14 +131,13 @@ func (pool *BlockPool) IsCaughtUp() bool {
 	pool.mtx.Unlock()
 
 	pool.peersMtx.Lock()
-	numPeers := len(pool.peers)
 	maxPeerHeight := 0
 	for _, peer := range pool.peers {
 		maxPeerHeight = MaxInt(maxPeerHeight, peer.height)
 	}
 	pool.peersMtx.Unlock()
 
-	return numPeers >= 3 && (height > 0 || time.Now().Sub(pool.startTime) > 30*time.Second) && (maxPeerHeight == 0 || height == maxPeerHeight)
+	return (height > 0 || time.Now().Sub(pool.startTime) > 5*time.Second) && (maxPeerHeight == 0 || height == maxPeerHeight)
 }
 
 // We need to see the second block's Validation to validate the first block.
diff --git a/config/tendermint/config.go b/config/tendermint/config.go
index 84452e2d1..b2e220fc0 100644
--- a/config/tendermint/config.go
+++ b/config/tendermint/config.go
@@ -56,7 +56,7 @@ func GetConfig(rootDir string) cfg.Config {
 	mapConfig.SetDefault("moniker", "anonymous")
 	mapConfig.SetDefault("node_laddr", "0.0.0.0:46656")
 	// mapConfig.SetDefault("seeds", "goldenalchemist.chaintest.net:46656")
-	mapConfig.SetDefault("fast_sync", false)
+	mapConfig.SetDefault("fast_sync", true)
 	mapConfig.SetDefault("skip_upnp", false)
 	mapConfig.SetDefault("addrbook_file", rootDir+"/addrbook.json")
 	mapConfig.SetDefault("priv_validator_file", rootDir+"/priv_validator.json")
@@ -77,7 +77,7 @@ proxy_app = "tcp://127.0.0.1:46658"
 moniker = "__MONIKER__"
 node_laddr = "0.0.0.0:46656"
 seeds = ""
-fast_sync = false
+fast_sync = true
 db_backend = "leveldb"
 log_level = "notice"
 rpc_laddr = "0.0.0.0:46657"