diff --git a/eth/filters/api.go b/eth/filters/api.go
index d7c053c44d..ed36c3a647 100644
--- a/eth/filters/api.go
+++ b/eth/filters/api.go
@@ -338,18 +338,12 @@ func (api *PublicFilterAPI) GetLogs(ctx context.Context, crit FilterCriteria) ([
 		filter = NewBlockFilter(api.backend, *crit.BlockHash, crit.Addresses, crit.Topics)
 	} else {
 		// Convert the RPC block numbers into internal representations
-		var (
-			begin int64
-			end   int64
-		)
-		if crit.FromBlock == nil {
-			begin = int64(rpc.LatestBlockNumber)
-		} else {
+		begin := rpc.LatestBlockNumber.Int64()
+		if crit.FromBlock != nil {
 			begin = crit.FromBlock.Int64()
 		}
-		if crit.ToBlock == nil {
-			end = int64(rpc.LatestBlockNumber)
-		} else {
+		end := rpc.LatestBlockNumber.Int64()
+		if crit.ToBlock != nil {
 			end = crit.ToBlock.Int64()
 		}
 		// Construct the range filter