diff --git a/src/infrastructure/database/migrations/versions/0020_fix_traffic_limit_strategy b/src/infrastructure/database/migrations/versions/0020_fix_traffic_limit_strategy.py
similarity index 100%
rename from src/infrastructure/database/migrations/versions/0020_fix_traffic_limit_strategy
rename to src/infrastructure/database/migrations/versions/0020_fix_traffic_limit_strategy.py
diff --git a/src/telegram/routers/subscription/getters.py b/src/telegram/routers/subscription/getters.py
index 5469e7e..82e7445 100644
--- a/src/telegram/routers/subscription/getters.py
+++ b/src/telegram/routers/subscription/getters.py
@@ -118,6 +118,7 @@ async def duration_getter(
     if not raw_plan:
         logger.debug("PlanDto not found in dialog data")
         await dialog_manager.start(state=Subscription.MAIN)
+        return {}
 
     plan = retort.load(raw_plan, PlanDto)
     settings = await settings_dao.get()
@@ -171,6 +172,7 @@ async def payment_method_getter(
     if not raw_plan:
         logger.error("PlanDto not found in dialog data")
         await dialog_manager.start(state=Subscription.MAIN)
+        return {}
 
     plan = retort.load(raw_plan, PlanDto)
     gateways = await payment_gateway_dao.get_active()
@@ -228,6 +230,7 @@ async def confirm_getter(
     if not raw_plan:
         logger.debug("PlanDto not found in dialog data")
         await dialog_manager.start(state=Subscription.MAIN)
+        return {}
 
     plan = retort.load(raw_plan, PlanDto)
     selected_duration = dialog_manager.dialog_data["selected_duration"]
diff --git a/src/telegram/routers/subscription/handlers.py b/src/telegram/routers/subscription/handlers.py
index 6583eaa..819deab 100644
--- a/src/telegram/routers/subscription/handlers.py
+++ b/src/telegram/routers/subscription/handlers.py
@@ -308,6 +308,7 @@ async def on_duration_select(
     if not raw_plan:
         logger.error("PlanDto not found in dialog data")
         await dialog_manager.start(state=Subscription.MAIN)
+        return
 
     plan = retort.load(raw_plan, PlanDto)
     settings = await settings_dao.get()
@@ -390,6 +391,7 @@ async def on_payment_method_select(
     if not raw_plan:
         logger.error("PlanDto not found in dialog data")
         await dialog_manager.start(state=Subscription.MAIN)
+        return
 
     plan = retort.load(raw_plan, PlanDto)