diff --git a/Gii/GiiModel.php b/Gii/GiiModel.php
index f781506b..c2d31d0f 100644
--- a/Gii/GiiModel.php
+++ b/Gii/GiiModel.php
@@ -217,8 +217,9 @@ use Database\ActiveRecord;
 
 		$prefixed = $this->db->tablePrefix;
 		if (!empty($prefixed)) {
-			$field = str_replace($prefixed, '', $field);
 			if (str_starts_with($field, $prefixed)) {
+				$field = str_replace($prefixed, '', $field);
+
 				$field = '{{%' . $field . '}}';
 			}
 		}