diff --git a/R/layers2traces.R b/R/layers2traces.R
index 6a6ad2dd6b..ca260f6835 100644
--- a/R/layers2traces.R
+++ b/R/layers2traces.R
@@ -368,7 +368,7 @@ to_basic.GeomRasterAnn <- function(data, prestats_data, layout, params, p, ...)
 #' @export
 to_basic.GeomTile <- function(data, prestats_data, layout, params, p, ...) {
   # geom2trace.GeomTile is a heatmap, which requires continuous fill
-  if (is.discrete(prestats_data$fill %||% NA_character_)) {
+  if (is.discrete(data$fill_plotlyDomain %||% NA_character_)) {
     data <- prefix_class(data, "GeomRect")
     to_basic(data, prestats_data, layout, params, p)
   } else {