diff --git a/server/src/OpenEMS.Analytics/ElectricityMeterSample.cs b/server/src/OpenEMS.Analytics/ElectricityMeterSample.cs
index 71c07d0..18344f5 100644
--- a/server/src/OpenEMS.Analytics/ElectricityMeterSample.cs
+++ b/server/src/OpenEMS.Analytics/ElectricityMeterSample.cs
@@ -12,7 +12,7 @@ public class ElectricityMeterSample : IHasOwner
     /// <summary>
     /// Gets the <see cref="ElectricityMeter.CurrentPower"/>.
     /// </summary>
-    public required Watt CurrentPower { get; init; }
+    public required Watt? CurrentPower { get; init; }
 
     /// <summary>
     /// Gets the <see cref="ElectricityMeter.CurrentPowerDirection"/>.
@@ -22,12 +22,12 @@ public class ElectricityMeterSample : IHasOwner
     /// <summary>
     /// Gets the <see cref="ElectricityMeter.TotalEnergyConsumption"/>.
     /// </summary>
-    public required WattHours TotalEnergyConsumption { get; init; }
+    public required WattHours? TotalEnergyConsumption { get; init; }
 
     /// <summary>
     /// Gets the <see cref="ElectricityMeter.TotalEnergyFeedIn"/>.
     /// </summary>
-    public required WattHours TotalEnergyFeedIn { get; init; }
+    public required WattHours? TotalEnergyFeedIn { get; init; }
 
     /// <summary>
     /// Gets the <see cref="ElectricityMeter.OwnedBy"/>.
diff --git a/server/src/OpenEMS.Analytics/ProducerSample.cs b/server/src/OpenEMS.Analytics/ProducerSample.cs
index 873f50b..71b1649 100644
--- a/server/src/OpenEMS.Analytics/ProducerSample.cs
+++ b/server/src/OpenEMS.Analytics/ProducerSample.cs
@@ -12,12 +12,12 @@ public class ProducerSample : IHasOwner
     /// <summary>
     /// Gets the <see cref="Producer.CurrentPowerProduction"/>.
     /// </summary>
-    public required Watt CurrentPowerProduction { get; init; }
+    public required Watt? CurrentPowerProduction { get; init; }
 
     /// <summary>
     /// Gets the <see cref="Producer.TotalEnergyProduction"/>.
     /// </summary>
-    public required WattHours TotalEnergyProduction { get; init; }
+    public required WattHours? TotalEnergyProduction { get; init; }
 
     /// <summary>
     /// Gets the <see cref="Producer.OwnedBy"/>.
diff --git a/server/test/OpenEMS.Infrastructure.Test/Analytics/DbContextDeviceSamplerTest.Creates_Electricity_Meter_Samples.verified.txt b/server/test/OpenEMS.Infrastructure.Test/Analytics/DbContextDeviceSamplerTest.Creates_Electricity_Meter_Samples.verified.txt
index a8a4468..815a5b4 100644
--- a/server/test/OpenEMS.Infrastructure.Test/Analytics/DbContextDeviceSamplerTest.Creates_Electricity_Meter_Samples.verified.txt
+++ b/server/test/OpenEMS.Infrastructure.Test/Analytics/DbContextDeviceSamplerTest.Creates_Electricity_Meter_Samples.verified.txt
@@ -7,7 +7,6 @@
       CurrentPower: 1200,
       CurrentPowerDirection: Consume,
       TotalEnergyConsumption: 400,
-      TotalEnergyFeedIn: 0,
       OwnedBy: test-user
     },
     {
@@ -15,7 +14,6 @@
       Timestamp: 2024-08-31 13:34:59 +0,
       CurrentPower: 200,
       CurrentPowerDirection: FeedIn,
-      TotalEnergyConsumption: 0,
       TotalEnergyFeedIn: 150,
       OwnedBy: test-user
     }