diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyEditor.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyEditor.tsx
index a5b910c85b..ead7a41912 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyEditor.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyEditor.tsx
@@ -46,8 +46,8 @@ export default function SurveyEditor({
 
   // when the survey type changes, we need to reset the active question id to the first question
   useEffect(() => {
-    if (survey?.questions?.length > 0) {
-      setActiveQuestionId(survey.questions[0].id);
+    if (localSurvey && localSurvey.questions?.length > 0) {
+      setActiveQuestionId(localSurvey.questions[0].id);
     }
   }, [localSurvey?.type]);
 
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/WhenToSendCard.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/WhenToSendCard.tsx
index 391c2f4fc7..5b46da1f36 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/WhenToSendCard.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/WhenToSendCard.tsx
@@ -96,7 +96,6 @@ export default function WhenToSendCard({
     setLocalSurvey(updatedSurvey);
   };
   useEffect(() => {
-    console.log(actionClassArray);
     if (activeIndex !== null) {
       setTriggerEvent(activeIndex, actionClassArray[actionClassArray.length - 1].id);
     }
diff --git a/packages/surveys/src/components/Survey.tsx b/packages/surveys/src/components/Survey.tsx
index 92d5de0009..021071b3a3 100644
--- a/packages/surveys/src/components/Survey.tsx
+++ b/packages/surveys/src/components/Survey.tsx
@@ -22,7 +22,7 @@ export function Survey({
   isRedirectDisabled = false,
   prefillResponseData,
 }: SurveyBaseProps) {
-  const [questionId, setQuestionId] = useState(activeQuestionId || survey.questions[0].id);
+  const [questionId, setQuestionId] = useState(activeQuestionId || survey.questions[0]?.id);
   const [loadingElement, setLoadingElement] = useState(false);
   const [history, setHistory] = useState<string[]>([]);
   const [responseData, setResponseData] = useState<TResponseData>({});