diff --git a/src/main/java/de/avatic/lcc/service/calculation/execution/steps/ShippingFrequencyCalculationService.java b/src/main/java/de/avatic/lcc/service/calculation/execution/steps/ShippingFrequencyCalculationService.java
index 3b4e78d..7f78659 100644
--- a/src/main/java/de/avatic/lcc/service/calculation/execution/steps/ShippingFrequencyCalculationService.java
+++ b/src/main/java/de/avatic/lcc/service/calculation/execution/steps/ShippingFrequencyCalculationService.java
@@ -17,10 +17,10 @@ public class ShippingFrequencyCalculationService {
         int minAnnualFrequency = Integer.parseInt(propertyRepository.getPropertyByMappingId(SystemPropertyMappingId.FREQ_MIN, setId).orElseThrow().getCurrentValue());
         int maxAnnualFrequency = Integer.parseInt(propertyRepository.getPropertyByMappingId(SystemPropertyMappingId.FREQ_MAX, setId).orElseThrow().getCurrentValue());
 
-        var fullContainers = huAnnualAmount / maxHuPerContainer;
-
-        if(fillContainer && huAnnualAmount > (double) maxAnnualFrequency)
-            return fullContainers;
+        if (fillContainer) {
+            var fullContainers = huAnnualAmount / maxHuPerContainer;
+            return fullContainers > minAnnualFrequency ? fullContainers : minAnnualFrequency;
+        }
 
         if (huAnnualAmount > (double) maxAnnualFrequency)
             return maxAnnualFrequency;