diff --git a/eth/api_debug.go b/eth/api_debug.go
index 9cfa9103fb..c25e024cb2 100644
--- a/eth/api_debug.go
+++ b/eth/api_debug.go
@@ -62,14 +62,13 @@ func (api *DebugAPI) DumpBlock(blockNr rpc.BlockNumber) (state.Dump, error) {
 		return stateDb.RawDump(opts), nil
 	}
 	var header *types.Header
-	switch blockNr {
-	case rpc.LatestBlockNumber:
+	if blockNr == rpc.LatestBlockNumber {
 		header = api.eth.blockchain.CurrentBlock()
-	case rpc.FinalizedBlockNumber:
+	} else if blockNr == rpc.FinalizedBlockNumber {
 		header = api.eth.blockchain.CurrentFinalBlock()
-	case rpc.SafeBlockNumber:
+	} else if blockNr == rpc.SafeBlockNumber {
 		header = api.eth.blockchain.CurrentSafeBlock()
-	default:
+	} else {
 		block := api.eth.blockchain.GetBlockByNumber(uint64(blockNr))
 		if block == nil {
 			return state.Dump{}, fmt.Errorf("block #%d not found", blockNr)
@@ -147,14 +146,13 @@ func (api *DebugAPI) AccountRange(blockNrOrHash rpc.BlockNumberOrHash, start hex
 			}
 		} else {
 			var header *types.Header
-			switch number {
-			case rpc.LatestBlockNumber:
+			if number == rpc.LatestBlockNumber {
 				header = api.eth.blockchain.CurrentBlock()
-			case rpc.FinalizedBlockNumber:
+			} else if number == rpc.FinalizedBlockNumber {
 				header = api.eth.blockchain.CurrentFinalBlock()
-			case rpc.SafeBlockNumber:
+			} else if number == rpc.SafeBlockNumber {
 				header = api.eth.blockchain.CurrentSafeBlock()
-			default:
+			} else {
 				block := api.eth.blockchain.GetBlockByNumber(uint64(number))
 				if block == nil {
 					return state.IteratorDump{}, fmt.Errorf("block #%d not found", number)