diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go
index da7d36c24d..3423d18abd 100644
--- a/internal/ethapi/api.go
+++ b/internal/ethapi/api.go
@@ -531,7 +531,10 @@ func (api *BlockChainAPI) GetStorageAt(ctx context.Context, address common.Addre
 // GetBlockReceipts returns the block receipts for the given block hash or number or tag.
 func (api *BlockChainAPI) GetBlockReceipts(ctx context.Context, blockNrOrHash rpc.BlockNumberOrHash) ([]map[string]interface{}, error) {
 	block, err := api.b.BlockByNumberOrHash(ctx, blockNrOrHash)
-	if block == nil || err != nil {
+	if err != nil {
+		return nil, err
+	}
+	if block == nil {
 		// When the block doesn't exist, the RPC method should return JSON null
 		// as per specification.
 		return nil, nil