diff --git a/R/layout-quad-add.R b/R/layout-quad-add.R
index d7f7a18c..82a84e90 100644
--- a/R/layout-quad-add.R
+++ b/R/layout-quad-add.R
@@ -306,7 +306,7 @@ quad_body_add <- function(object, quad, object_name) {
 #' @importFrom ggplot2 ggplot_add
 #' @export
 quad_body_add.default <- function(object, quad, object_name) {
-    quad@plot <- ggplot_add(object, quad@plot, object_name)
+    quad@plot <- ggplot_add(object, ggfun("plot_clone")(quad@plot), object_name)
     quad
 }
 
diff --git a/R/plot-.R b/R/plot-.R
index 0341cc35..8267fde1 100644
--- a/R/plot-.R
+++ b/R/plot-.R
@@ -171,7 +171,7 @@ plot_add <- function(object, plot, object_name) {
 #' @importFrom ggplot2 ggplot_add
 #' @export
 plot_add.default <- function(object, plot, object_name) {
-    plot@plot <- ggplot_add(object, plot@plot, object_name)
+    plot@plot <- ggplot_add(object, ggfun("plot_clone")(plot@plot), object_name)
     plot
 }