diff --git a/R/data-helpers.R b/R/data-helpers.R
index 310abe1fd..ded6b62c5 100644
--- a/R/data-helpers.R
+++ b/R/data-helpers.R
@@ -618,11 +618,12 @@ validate_newdata2 <- function(newdata2, object, ...) {
 }
 
 # extract the current data
-current_data <- function(object, newdata = NULL, skip_validate_data = FALSE, ...) {
+current_data <- function(object, newdata = NULL, skip_validation = FALSE, ...) {
   stopifnot(is.brmsfit(object))
+  skip_validation <- as_one_logical(skip_validation)
   if (is.null(newdata)) {
     data <- object$data
-  } else if(skip_validate_data) {
+  } else if (skip_validation) {
     data <- newdata
   } else {
     data <- validate_newdata(newdata, object = object, ...)
@@ -631,11 +632,12 @@ current_data <- function(object, newdata = NULL, skip_validate_data = FALSE, ...
 }
 
 # extract the current data2
-current_data2 <- function(object, newdata2 = NULL, skip_validate_data = FALSE, ...) {
+current_data2 <- function(object, newdata2 = NULL, skip_validation = FALSE, ...) {
   stopifnot(is.brmsfit(object))
+  skip_validation <- as_one_logical(skip_validation)
   if (is.null(newdata2)) {
     data2 <- object$data2
-  } else if(skip_validate_data) {
+  } else if (skip_validation) {
     data2 <- newdata2
   } else {
     data2 <- validate_newdata2(newdata2, object = object, ...)