diff --git a/frontend/src/component/insights/componentsChart/TimeToProductionChart/TimeToProductionChart.tsx b/frontend/src/component/insights/componentsChart/TimeToProductionChart/TimeToProductionChart.tsx
index d5ce52f9fd..a5e0955518 100644
--- a/frontend/src/component/insights/componentsChart/TimeToProductionChart/TimeToProductionChart.tsx
+++ b/frontend/src/component/insights/componentsChart/TimeToProductionChart/TimeToProductionChart.tsx
@@ -1,4 +1,4 @@
-import { useMemo, type VFC } from 'react';
+import { useMemo, type FC } from 'react';
 import 'chartjs-adapter-date-fns';
 import type { InstanceInsightsSchema } from 'openapi';
 import {
@@ -21,7 +21,7 @@ interface ITimeToProductionChartProps {
     isLoading?: boolean;
 }
 
-export const TimeToProductionChart: VFC<ITimeToProductionChartProps> = ({
+export const TimeToProductionChart: FC<ITimeToProductionChartProps> = ({
     projectFlagTrends,
     isAggregate,
     isLoading,
@@ -35,9 +35,20 @@ export const TimeToProductionChart: VFC<ITimeToProductionChartProps> = ({
         [projectsDatasets, isLoading],
     );
 
+    const filteredProjectsDatasets = useMemo(
+        () => ({
+            ...projectsDatasets,
+            datasets: projectsDatasets.datasets.map((dataset) => ({
+                ...dataset,
+                data: dataset.data.filter((item) => item.timeToProduction),
+            })),
+        }),
+        [projectsDatasets],
+    );
+
     const aggregatedPerDay = useMemo(() => {
         const result = medianTimeToProduction(
-            Object.values(projectsDatasets.datasets).flatMap(
+            Object.values(filteredProjectsDatasets.datasets).flatMap(
                 (item) => item.data,
             ),
         );
@@ -60,9 +71,9 @@ export const TimeToProductionChart: VFC<ITimeToProductionChartProps> = ({
                 },
             ],
         };
-    }, [JSON.stringify(projectsDatasets), theme]);
+    }, [JSON.stringify(filteredProjectsDatasets), theme]);
 
-    const data = isAggregate ? aggregatedPerDay : projectsDatasets;
+    const data = isAggregate ? aggregatedPerDay : filteredProjectsDatasets;
     const placeholderData = usePlaceholderData();
     return (
         <LineChart
diff --git a/src/lib/features/feature-toggle/time-to-production/time-to-production.test.ts b/src/lib/features/feature-toggle/time-to-production/time-to-production.test.ts
index e2b90cc628..299e64c6a0 100644
--- a/src/lib/features/feature-toggle/time-to-production/time-to-production.test.ts
+++ b/src/lib/features/feature-toggle/time-to-production/time-to-production.test.ts
@@ -23,4 +23,31 @@ describe('calculate average time to production', () => {
 
         expect(timeToProduction).toBe(21);
     });
+
+    test('should return more than 0 if feature was enabled almost instantly', () => {
+        const timeToProduction = calculateAverageTimeToProd([
+            {
+                created: new Date('2024-11-11T09:11:11.111Z'),
+                enabled: new Date('2024-11-11T09:11:11.112Z'),
+            },
+            {
+                created: new Date('2024-12-12T09:12:11.121Z'),
+                enabled: new Date('2024-12-12T09:12:12.122Z'),
+            },
+        ]);
+
+        expect(timeToProduction).toBe(0.1);
+    });
+
+    test('should return more than 0 if feature was enabled instantly', () => {
+        const created = new Date('2024-11-11T09:11:11.111Z');
+        const timeToProduction = calculateAverageTimeToProd([
+            {
+                created,
+                enabled: created,
+            },
+        ]);
+
+        expect(timeToProduction).toBe(0.1);
+    });
 });
diff --git a/src/lib/features/feature-toggle/time-to-production/time-to-production.ts b/src/lib/features/feature-toggle/time-to-production/time-to-production.ts
index 80d6cb501c..c1ae174faa 100644
--- a/src/lib/features/feature-toggle/time-to-production/time-to-production.ts
+++ b/src/lib/features/feature-toggle/time-to-production/time-to-production.ts
@@ -12,8 +12,9 @@ export const calculateAverageTimeToProd = (
     const timeToProdPerFeature = calculateTimeToProdForFeatures(items);
     if (timeToProdPerFeature.length) {
         const sum = timeToProdPerFeature.reduce((acc, curr) => acc + curr, 0);
+        const avg = sum / Object.keys(items).length;
 
-        return Number((sum / Object.keys(items).length).toFixed(1));
+        return Number(avg.toFixed(1)) || 0.1;
     }
 
     return 0;