diff --git a/framework/validators/BooleanValidator.php b/framework/validators/BooleanValidator.php
index 3b9f9aad71..348d9dd58e 100644
--- a/framework/validators/BooleanValidator.php
+++ b/framework/validators/BooleanValidator.php
@@ -56,17 +56,9 @@ class BooleanValidator extends Validator
                  || $this->strict && ($value === $this->trueValue || $value === $this->falseValue);
 
         if (!$valid) {
-            $trueParamMessage = $this->trueValue;
-            $falseParamMessage = $this->falseValue;
-            if ($this->trueValue === true) {
-                $trueParamMessage = 'true';
-            }
-            if ($this->falseValue === false) {
-                $falseParamMessage = 'false';
-            }
             return [$this->message, [
-                'true' => $trueParamMessage,
-                'false' => $falseParamMessage,
+                'true' => $this->trueValue === true ? 'true' : $this->trueValue,
+                'false' => $this->falseValue === false ? 'false' : $this->falseValue,
             ]];
         }
 
@@ -78,22 +70,13 @@ class BooleanValidator extends Validator
      */
     public function clientValidateAttribute($model, $attribute, $view)
     {
-        $trueParamMessage = $this->trueValue;
-        $falseParamMessage = $this->falseValue;
-        if ($this->trueValue === true) {
-            $trueParamMessage = 'true';
-        }
-        if ($this->falseValue === false) {
-            $falseParamMessage = 'false';
-        }
-
         $options = [
             'trueValue' => $this->trueValue,
             'falseValue' => $this->falseValue,
             'message' => Yii::$app->getI18n()->format($this->message, [
                 'attribute' => $model->getAttributeLabel($attribute),
-                'true' => $trueParamMessage,
-                'false' => $falseParamMessage,
+                'true' => $this->trueValue === true ? 'true' : $this->trueValue,
+                'false' => $this->falseValue === false ? 'false' : $this->falseValue,
             ], Yii::$app->language),
         ];
         if ($this->skipOnEmpty) {