diff --git a/lib/utils/hooks/metrics/useVkMetricsGoals.ts b/lib/utils/hooks/metrics/useVkMetricsGoals.ts
index e215bb8..bc7e7c4 100644
--- a/lib/utils/hooks/metrics/useVkMetricsGoals.ts
+++ b/lib/utils/hooks/metrics/useVkMetricsGoals.ts
@@ -32,14 +32,14 @@ export const useVkMetricsGoals = (vkId: number | undefined) => {
     resultIdShown: (resultId: string) =>
       sendMetrics(vkId, `penaquiz-result-${resultId}`),
     // Посетитель нажал на ссылку в результате
-    resultLink: () =>
-      sendMetrics(vkId, `penaquiz-resultlink`),
+    resultLink: () => sendMetrics(vkId, `penaquiz-resultlink`),
     // Посетитель дошёл до формы контактов
     contactsFormOpened: () => sendMetrics(vkId, "penaquiz-form"),
     // Посетитель заполнил форму контактов
     contactsFormFilled: () => sendMetrics(vkId, "penaquiz-contacts"),
     // Посетитель заполнил поле формы контактов
-    contactsFormField: (field: string) => sendMetrics(vkId, `penaquiz-formfield-${field}`),
+    contactsFormField: (field: string) =>
+      sendMetrics(vkId, `penaquiz-formfield-${field}`),
     // Посетитель отправил заявку с мессенджером
     messengerRequestSended: (messenger: MetricsMessengers) =>
       sendMetrics(vkId, `penaquiz-messengers-${messenger}`),
diff --git a/lib/utils/hooks/metrics/useYandexMetricsGoals.ts b/lib/utils/hooks/metrics/useYandexMetricsGoals.ts
index c822903..f0b2c98 100644
--- a/lib/utils/hooks/metrics/useYandexMetricsGoals.ts
+++ b/lib/utils/hooks/metrics/useYandexMetricsGoals.ts
@@ -24,14 +24,14 @@ export const useYandexMetricsGoals = (id: number | undefined) => {
     resultIdShown: (resultId: string) =>
       sendMetrics(id, `penaquiz-result-${resultId}`),
     // Посетитель нажал на ссылку в результате
-    resultLink: () =>
-      sendMetrics(id, `penaquiz-resultlink`),
+    resultLink: () => sendMetrics(id, `penaquiz-resultlink`),
     // Посетитель дошёл до формы контактов
     contactsFormOpened: () => sendMetrics(id, "penaquiz-form"),
     // Посетитель заполнил форму контактов
     contactsFormFilled: () => sendMetrics(id, "penaquiz-contacts"),
     // Посетитель заполнил поле формы контактов
-    contactsFormField: (field: string) => sendMetrics(id, `penaquiz-formfield-${field}`),
+    contactsFormField: (field: string) =>
+      sendMetrics(id, `penaquiz-formfield-${field}`),
     // Посетитель отправил заявку с мессенджером
     messengerRequestSended: (messenger: MetricsMessengers) =>
       sendMetrics(id, `penaquiz-messengers-${messenger}`),
diff --git a/lib/utils/hooks/useQuestionFlowControl.ts b/lib/utils/hooks/useQuestionFlowControl.ts
index eecd1c0..c7abc6d 100644
--- a/lib/utils/hooks/useQuestionFlowControl.ts
+++ b/lib/utils/hooks/useQuestionFlowControl.ts
@@ -206,13 +206,14 @@ export function useQuestionFlowControl() {
   const moveToNextQuestion = useCallback(() => {
     if (!nextQuestion) throw new Error("Next question not found");
 
-    if (nextQuestion.type === "result") return showResult();
     // Засчитываем  переход с вопроса дальше
     vkMetrics.questionPassed(currentQuestion.id);
     yandexMetrics.questionPassed(currentQuestion.id);
 
+    if (nextQuestion.type === "result") return showResult();
+
     setCurrentQuestionId(nextQuestion.id);
-  }, [nextQuestion, showResult]);
+  }, [currentQuestion, nextQuestion, showResult]);
 
   const setQuestion = useCallback(
     (questionId: string) => {