diff --git a/handlers/keys/key_mode/key_cluster_mode.py b/handlers/keys/key_mode/key_cluster_mode.py
index 114a6bae..f24378ae 100644
--- a/handlers/keys/key_mode/key_cluster_mode.py
+++ b/handlers/keys/key_mode/key_cluster_mode.py
@@ -182,7 +182,7 @@ async def key_cluster_mode(
             "intercept_key_creation_message", 
             chat_id=tg_id, 
             session=session, 
-            target_message=target_message
+            target_message=message_or_query
         )
         if intercept_results and intercept_results[0]:
             return
diff --git a/handlers/keys/key_mode/key_country_mode.py b/handlers/keys/key_mode/key_country_mode.py
index 6ab957ff..3d3d2829 100644
--- a/handlers/keys/key_mode/key_country_mode.py
+++ b/handlers/keys/key_mode/key_country_mode.py
@@ -524,7 +524,7 @@ async def finalize_key_creation(
             "intercept_key_creation_message", 
             chat_id=tg_id, 
             session=session, 
-            target_message=callback_query.message
+            target_message=callback_query
         )
         if intercept_results and intercept_results[0]:
             return