diff --git a/beacon/config/config.go b/beacon/config/config.go
index f57eae05..e9ab1d6e 100644
--- a/beacon/config/config.go
+++ b/beacon/config/config.go
@@ -36,7 +36,7 @@ const UnitInCoin = 100000000
 
 // MainNetConfig is the config used on the mainnet
 var MainNetConfig = Config{
-	ShardCount:                         8,
+	ShardCount:                         64,
 	TargetCommitteeSize:                3,
 	EjectionBalance:                    16,
 	MaxBalanceChurnQuotient:            32,
diff --git a/primitives/state.go b/primitives/state.go
index 80f3be5b..3316d879 100644
--- a/primitives/state.go
+++ b/primitives/state.go
@@ -1361,7 +1361,7 @@ func (s *State) ProcessEpochTransition(c *config.Config, view BlockView) ([]Rece
 		}
 
 		if len(possibleHashes) == 0 {
-			return nil, fmt.Errorf("no votes counted for shard %d", shardCommittee.Shard)
+			return nil, nil
 		}
 
 		// find the top balance