diff --git a/R/plot-free-gg.R b/R/plot-free-gg.R
index 16c19c42..1fedf95c 100644
--- a/R/plot-free-gg.R
+++ b/R/plot-free-gg.R
@@ -53,7 +53,7 @@ free_gg.ggplot <- function(..., data = waiver(), size = NULL, active = NULL) {
     plot <- data
     # In ggplot2, `waiver()` was regard to no data
     data <- .subset2(plot, "data") %|w|% NULL
-    plot["data"] <- list(NULL)
+    plot["data"] <- list(waiver())
     new_free_gg(plot, data, size = size, active = active)
 }