diff --git a/R/VizEquiMap.R b/R/VizEquiMap.R
index 7449f7ce532ca09b1d5fc491eff99b3e7a7d571b..84e8ae0985b5988b0b305f2d5d97df80c2655a4f 100644
--- a/R/VizEquiMap.R
+++ b/R/VizEquiMap.R
@@ -514,7 +514,8 @@ VizEquiMap <- function(var, lon, lat, varu = NULL, varv = NULL,
   }
 
   if (!all(is.na(var))) {
-    var_limits <- c(min(var, na.rm = TRUE), max(var, na.rm = TRUE))
+    var_limits <- c(min(var[!is.infinite(var)], na.rm = TRUE),
+                    max(var[!is.infinite(var)], na.rm = TRUE))
   } else {
     warning("All the data are NAs. The map will be filled with colNA.")
     if (!is.null(brks) && length(brks) > 1) {
diff --git a/R/VizLayout.R b/R/VizLayout.R
index 0e4e64128b17b84e12e34fc6aea46f6d3aa909bc..25e6bbd23e2a9097e1c1c7ce6cdba368d8cb276b 100644
--- a/R/VizLayout.R
+++ b/R/VizLayout.R
@@ -332,7 +332,9 @@ VizLayout <- function(fun, plot_dims, var, ..., special_args = NULL,
   # Check the rest of parameters (unless the user simply wants to build an empty layout)
   if (!all(sapply(var, is_single_na))) {
     if (!all(is.na(unlist(var)))) {
-      var_limits <- c(min(unlist(var), na.rm = TRUE), max(unlist(var), na.rm = TRUE))
+      tmp <- !is.infinite(unlist(var))
+      var_limits <- c(min(unlist(var)[tmp], na.rm = TRUE),
+                      max(unlist(var)[tmp], na.rm = TRUE))
     } else {
       if (!is.null(brks)) {
         #NOTE: var_limits be like this to avoid warnings from ColorBar