diff --git a/state/factory/workingset.go b/state/factory/workingset.go
index 273103e6a8..c572d02181 100644
--- a/state/factory/workingset.go
+++ b/state/factory/workingset.go
@@ -333,11 +333,6 @@ func (ws *workingSet) validateNonce(ctx context.Context, blk *block.Block) error
 		}
 		appendActionIndex(accountNonceMap, caller.String(), selp.Nonce())
 	}
-
-	// Special handling for genesis block
-	if blk.Height() == 0 {
-		return nil
-	}
 	return ws.checkNonceContinuity(ctx, accountNonceMap)
 }
 
@@ -358,11 +353,6 @@ func (ws *workingSet) validateNonce2(ctx context.Context, blk *block.Block) erro
 		}
 		accountNonceMap[srcAddr] = append(accountNonceMap[srcAddr], selp.Nonce())
 	}
-
-	// Special handling for genesis block
-	if blk.Height() == 0 {
-		return nil
-	}
 	return ws.checkNonceContinuity(ctx, accountNonceMap)
 }