diff --git a/bot/handlers/forms/entity_form.py b/bot/handlers/forms/entity_form.py
index add27c2..a93bf8d 100644
--- a/bot/handlers/forms/entity_form.py
+++ b/bot/handlers/forms/entity_form.py
@@ -62,6 +62,10 @@ async def entity_item(
 
     entity_item = await entity_type.get(session=db_session, id=callback_data.entity_id)
 
+    state: FSMContext = kwargs["state"]
+    state_data = kwargs["state_data"]
+    await state.set_data(state_data)
+
     if not entity_item:
         return await query.answer(
             text=(await Settings.get(Settings.APP_STRINGS_NOT_FOUND))
@@ -263,9 +267,9 @@ async def entity_item(
             )
         )
 
-    state: FSMContext = kwargs["state"]
-    state_data = kwargs["state_data"]
-    await state.set_data(state_data)
+    # state: FSMContext = kwargs["state"]
+    # state_data = kwargs["state_data"]
+    # await state.set_data(state_data)
 
     send_message = get_send_message(query)