diff --git a/ydb/core/fq/libs/row_dispatcher/topic_session.cpp b/ydb/core/fq/libs/row_dispatcher/topic_session.cpp
index 5c755e71a751..9185cdae9fdd 100644
--- a/ydb/core/fq/libs/row_dispatcher/topic_session.cpp
+++ b/ydb/core/fq/libs/row_dispatcher/topic_session.cpp
@@ -308,7 +308,7 @@ class TTopicSession : public TActorBootstrapped<TTopicSession> {
         ExceptionFunc(std::exception, HandleException)
     )
 
-    STRICT_STFUNC(ErrorState, {
+    STRICT_STFUNC_EXC(ErrorState,
         cFunc(NActors::TEvents::TEvPoisonPill::EventType, PassAway);
         IgnoreFunc(NFq::TEvPrivate::TEvPqEventsReady);
         IgnoreFunc(NFq::TEvPrivate::TEvCreateSession);
@@ -319,8 +319,9 @@ class TTopicSession : public TActorBootstrapped<TTopicSession> {
         IgnoreFunc(NFq::TEvRowDispatcher::TEvStartSession);
         IgnoreFunc(NFq::TEvRowDispatcher::TEvStopSession);
         IgnoreFunc(NFq::TEvPrivate::TEvSendStatisticToRowDispatcher);
-        IgnoreFunc(TEvRowDispatcher::TEvPurecalcCompileResponse);
-    })
+        IgnoreFunc(TEvRowDispatcher::TEvPurecalcCompileResponse);,
+        ExceptionFunc(std::exception, HandleException)
+    )
 };
 
 TTopicSession::TTopicSession(