diff --git a/packages/database/migration/20251118032116_migrate_questions_to_blocks/migration.ts b/packages/database/migration/20251118032116_migrate_questions_to_blocks/migration.ts
index c897176544..72285b1c98 100644
--- a/packages/database/migration/20251118032116_migrate_questions_to_blocks/migration.ts
+++ b/packages/database/migration/20251118032116_migrate_questions_to_blocks/migration.ts
@@ -1,7 +1,7 @@
 import { createId } from "@paralleldrive/cuid2";
 import { logger } from "@formbricks/logger";
 import type { MigrationScript } from "../../src/scripts/migration-runner";
-import type { Block, CTAMigrationStats, SurveyQuestion, SurveyRecord } from "./types";
+import type { Block, CTAMigrationStats, SurveyRecord } from "./types";
 import { migrateQuestionsSurveyToBlocks } from "./utils";
 
 export const migrateQuestionsToBlocks: MigrationScript = {
@@ -31,8 +31,7 @@ export const migrateQuestionsToBlocks: MigrationScript = {
     logger.info(`Found ${surveys.length.toString()} surveys to migrate`);
 
     // 2. Process each survey
-    const updates: { id: string; blocks: Block[]; questions: SurveyQuestion[] }[] = [];
-    let failedCount = 0;
+    const updates: { id: string; blocks: Block[] }[] = [];
 
     for (const survey of surveys) {
       try {
@@ -40,22 +39,16 @@ export const migrateQuestionsToBlocks: MigrationScript = {
         updates.push({
           id: migrated.id,
           blocks: migrated.blocks,
-          questions: [],
         });
       } catch (error) {
-        failedCount++;
         logger.error(error, `Failed to migrate survey ${survey.id}`);
+        throw new Error(
+          `Migration failed for survey ${survey.id}: ${error instanceof Error ? error.message : String(error)}`
+        );
       }
     }
 
-    if (updates.length === 0) {
-      logger.error(`All ${failedCount.toString()} surveys failed migration`);
-      throw new Error("Migration failed for all surveys");
-    }
-
-    logger.info(
-      `Successfully processed ${updates.length.toString()} surveys, ${failedCount.toString()} failed`
-    );
+    logger.info(`Successfully processed ${updates.length.toString()} surveys`);
 
     // 3. Update surveys individually for safety (avoids SQL injection risks with complex JSONB arrays)
     let updatedCount = 0;
@@ -71,10 +64,9 @@ export const migrateQuestionsToBlocks: MigrationScript = {
              SELECT array_agg(elem)
              FROM jsonb_array_elements($1::jsonb) AS elem
            ), 
-           questions = $2::jsonb 
-           WHERE id = $3`,
+           questions = '[]'::jsonb 
+           WHERE id = $2`,
           JSON.stringify(update.blocks),
-          JSON.stringify(update.questions),
           update.id
         );
 
@@ -86,16 +78,14 @@ export const migrateQuestionsToBlocks: MigrationScript = {
         }
       } catch (error) {
         logger.error(error, `Failed to update survey ${update.id} in database`);
-        failedCount++;
+        throw new Error(
+          `Database update failed for survey ${update.id}: ${error instanceof Error ? error.message : String(error)}`
+        );
       }
     }
 
     logger.info(`Migration complete: ${updatedCount.toString()} surveys migrated to blocks`);
 
-    if (failedCount > 0) {
-      logger.warn(`Warning: ${failedCount.toString()} surveys failed and need manual review`);
-    }
-
     // 4. Log CTA migration statistics
     if (ctaStats.totalCTAElements > 0) {
       logger.info(
diff --git a/packages/database/migration/20251118032116_migrate_questions_to_blocks/types.ts b/packages/database/migration/20251118032116_migrate_questions_to_blocks/types.ts
index f14a99e920..fdb3f66301 100644
--- a/packages/database/migration/20251118032116_migrate_questions_to_blocks/types.ts
+++ b/packages/database/migration/20251118032116_migrate_questions_to_blocks/types.ts
@@ -67,7 +67,6 @@ export interface SurveyRecord {
 export interface MigratedSurvey {
   id: string;
   blocks: Block[];
-  questions: SurveyQuestion[];
 }
 
 // Statistics tracking for CTA migration
diff --git a/packages/database/migration/20251118032116_migrate_questions_to_blocks/utils.ts b/packages/database/migration/20251118032116_migrate_questions_to_blocks/utils.ts
index 382a71cbb2..5e9a124f6a 100644
--- a/packages/database/migration/20251118032116_migrate_questions_to_blocks/utils.ts
+++ b/packages/database/migration/20251118032116_migrate_questions_to_blocks/utils.ts
@@ -350,7 +350,7 @@ export const migrateQuestionsSurveyToBlocks = (
 ): MigratedSurvey => {
   // Skip if no questions
   if (survey.questions.length === 0) {
-    return { ...survey, blocks: survey.blocks ?? [], questions: [] };
+    return { id: survey.id, blocks: survey.blocks ?? [] };
   }
 
   // STEP 1: Process CTA questions FIRST (before converting to blocks)
@@ -410,8 +410,7 @@ export const migrateQuestionsSurveyToBlocks = (
   }
 
   return {
-    ...survey,
+    id: survey.id,
     blocks,
-    questions: [],
   };
 };