diff --git a/usecases/cs/lpc/public.go b/usecases/cs/lpc/public.go
index 038d1434..925837a1 100644
--- a/usecases/cs/lpc/public.go
+++ b/usecases/cs/lpc/public.go
@@ -46,6 +46,9 @@ func (e *LPC) ConsumptionLimit() (limit ucapi.LoadLimit, resultErr error) {
 	if value.TimePeriod != nil && value.TimePeriod.EndTime != nil {
 		if duration, err := value.TimePeriod.GetDuration(); err == nil {
 			limit.Duration = duration
+			if limit.Duration == 0 {
+				limit.IsActive = false
+			}
 		}
 	}
 
diff --git a/usecases/cs/lpp/public.go b/usecases/cs/lpp/public.go
index ca2bf1c9..1ceec74b 100644
--- a/usecases/cs/lpp/public.go
+++ b/usecases/cs/lpp/public.go
@@ -46,6 +46,9 @@ func (e *LPP) ProductionLimit() (limit ucapi.LoadLimit, resultErr error) {
 	if value.TimePeriod != nil && value.TimePeriod.EndTime != nil {
 		if duration, err := value.TimePeriod.GetDuration(); err == nil {
 			limit.Duration = duration
+			if limit.Duration == 0 {
+				limit.IsActive = false
+			}
 		}
 	}