diff --git a/src/overhaul_scope/service.py b/src/overhaul_scope/service.py
index 4803132..e2f1d50 100644
--- a/src/overhaul_scope/service.py
+++ b/src/overhaul_scope/service.py
@@ -202,6 +202,9 @@ async def get_overview_overhaul(*, db_session: DbSession):
     )
 
     results = await db_session.execute(equipments)
+    
+    #Remaining days based on status
+    remaining_days = (selected_overhaul.start_date - current_date).days if selected_overhaul.status == "Upcoming" else (selected_overhaul.end_date - current_date).days
 
     return {
         "status": selected_overhaul.status,
@@ -212,7 +215,7 @@ async def get_overview_overhaul(*, db_session: DbSession):
             "end_date": selected_overhaul.end_date,
             "duration_oh": selected_overhaul.duration_oh,
             "crew_number": selected_overhaul.crew_number,
-            "remaining_days": (selected_overhaul.start_date - current_date).days,
+            "remaining_days": remaining_days,
             "equipment_count": len(results.scalars().all()),
         },
     }