diff --git a/VECTO3GUI/ViewModel/Impl/AirdragViewModel.cs b/VECTO3GUI/ViewModel/Impl/AirdragViewModel.cs
index df389d3dbe060cb06715a58bc69585bc21864d4f..d348a653f8ef2e8a65f40a7b692faaa708174c00 100644
--- a/VECTO3GUI/ViewModel/Impl/AirdragViewModel.cs
+++ b/VECTO3GUI/ViewModel/Impl/AirdragViewModel.cs
@@ -187,15 +187,15 @@ namespace VECTO3GUI.ViewModel.Impl
 			var inputData = JobViewModel.InputDataProvider as IDeclarationInputDataProvider;
 			_airdragData = inputData?.JobInputData.Vehicle.Components.AirdragInputData;
 			SetAirdragValues(_airdragData);
-			UseMeasurementData = _airdragData != null;
+			UseMeasurementData = _airdragData.AirDragArea != null;
 			NoAirdragData = !UseMeasurementData;
 			IsEditable = false;
 		}
 
 		private void SetAirdragValues(IAirdragDeclarationInputData airdrag)
 		{
-			UseMeasuredValues = airdrag != null;
-			if (airdrag == null)
+			UseMeasuredValues = airdrag.AirDragArea != null;
+			if (airdrag.AirDragArea == null)
 			{
 				_componentData = new AirdragComponentData(this, true);
 				return;