diff --git a/ydb/core/fq/libs/row_dispatcher/topic_session.cpp b/ydb/core/fq/libs/row_dispatcher/topic_session.cpp
index a9642647b9dc..46db3de18521 100644
--- a/ydb/core/fq/libs/row_dispatcher/topic_session.cpp
+++ b/ydb/core/fq/libs/row_dispatcher/topic_session.cpp
@@ -312,7 +312,7 @@ class TTopicSession : public TActorBootstrapped<TTopicSession> {
         ExceptionFunc(std::exception, HandleException)
     )
 
-    STRICT_STFUNC(ErrorState, {
+    STRICT_STFUNC_EXC(ErrorState,
         cFunc(TEvents::TEvPoisonPill::EventType, PassAway);
         IgnoreFunc(NFq::TEvPrivate::TEvPqEventsReady);
         IgnoreFunc(NFq::TEvPrivate::TEvCreateSession);
@@ -320,8 +320,9 @@ class TTopicSession : public TActorBootstrapped<TTopicSession> {
         IgnoreFunc(TEvRowDispatcher::TEvGetNextBatch);
         IgnoreFunc(NFq::TEvRowDispatcher::TEvStartSession);
         IgnoreFunc(NFq::TEvRowDispatcher::TEvStopSession);
-        IgnoreFunc(NFq::TEvPrivate::TEvSendStatisticToRowDispatcher);
-    })
+        IgnoreFunc(NFq::TEvPrivate::TEvSendStatisticToRowDispatcher);,
+        ExceptionFunc(std::exception, HandleException)
+    )
 };
 
 TTopicSession::TTopicSession(