diff --git a/src/Forms/Controls/BaseControl.php b/src/Forms/Controls/BaseControl.php
index da453f487..a0367000f 100644
--- a/src/Forms/Controls/BaseControl.php
+++ b/src/Forms/Controls/BaseControl.php
@@ -226,7 +226,7 @@ public function setOmitted($value = TRUE)
 	 */
 	public function isOmitted()
 	{
-		return $this->omitted || ($this->disabled && $this->omitted === NULL);
+		return $this->omitted || ($this->isDisabled() && $this->omitted === NULL);
 	}