diff --git a/R/FilterState.R b/R/FilterState.R
index 7fcf2e3eb..7fac2e9e9 100644
--- a/R/FilterState.R
+++ b/R/FilterState.R
@@ -43,7 +43,6 @@ FilterState <- R6::R6Class( # nolint
 
   # public methods ----
   public = list(
-
     #' @description
     #' Initialize a `FilterState` object.
     #'
@@ -107,7 +106,7 @@ FilterState <- R6::R6Class( # nolint
             varlabel
           }
 
-        private$state_history <- reactiveVal(list())
+        private$state_history <- withReactiveDomain(NULL, reactiveVal(list()))
 
         invisible(self)
       })
diff --git a/R/FilterStates.R b/R/FilterStates.R
index 34c725333..fd030bd0a 100644
--- a/R/FilterStates.R
+++ b/R/FilterStates.R
@@ -64,7 +64,7 @@ FilterStates <- R6::R6Class( # nolint
       }
       private$data <- data
       private$data_reactive <- data_reactive
-      private$state_list <- reactiveVal()
+      private$state_list <- withReactiveDomain(NULL, reactiveVal())
 
       # Clears state list when finalizing the object
       private$session_bindings[["clear_state_list"]] <- list(
diff --git a/R/FilteredDataset.R b/R/FilteredDataset.R
index 85e5e0b48..634d34f1d 100644
--- a/R/FilteredDataset.R
+++ b/R/FilteredDataset.R
@@ -34,7 +34,7 @@ FilteredDataset <- R6::R6Class( # nolint
       logger::log_debug("Instantiating { class(self)[1] }, dataname: { dataname }")
       checkmate::assert_character(keys, any.missing = FALSE)
       checkmate::assert_character(label, null.ok = TRUE)
-      private$allow_add <- reactiveVal(TRUE)
+      private$allow_add <- withReactiveDomain(NULL, reactiveVal(TRUE))
       private$dataset <- dataset
       private$dataname <- dataname
       private$keys <- keys