diff --git a/src/Forms/Controls/BaseControl.php b/src/Forms/Controls/BaseControl.php
index 02c4c1a7a..cb2d8aa79 100644
--- a/src/Forms/Controls/BaseControl.php
+++ b/src/Forms/Controls/BaseControl.php
@@ -196,7 +196,6 @@ public function setDefaultValue($value)
 	public function setDisabled($value = TRUE)
 	{
 		if ($this->disabled = (bool) $value) {
-			$this->omitted = TRUE;
 			$this->setValue(NULL);
 		}
 		return $this;
@@ -231,7 +230,7 @@ public function setOmitted($value = TRUE)
 	 */
 	public function isOmitted()
 	{
-		return $this->omitted;
+		return $this->omitted || $this->disabled;
 	}