diff --git a/src/pages/submit-assignment/AssignmentSubmitPage.tsx b/src/pages/submit-assignment/AssignmentSubmitPage.tsx
index 14b6d89..0b95138 100644
--- a/src/pages/submit-assignment/AssignmentSubmitPage.tsx
+++ b/src/pages/submit-assignment/AssignmentSubmitPage.tsx
@@ -13,7 +13,7 @@ import EllipsisIcon from '@/assets/svg/ellipsisIcon.svg?react';
 import AssignmentProblem from './ui/AssignmentProblem';
 import ChatQuestionModal from '@/features/chat/ui/ChatQuestionModal';
 import ChatIcon from '@/assets/svg/chatIcon.svg?react';
-import {useState, useRef} from 'react';
+import {useState, useRef, useEffect} from 'react';
 import type {CodeEditorRef} from './ui/CodeEditor';
 import SubmissionHistoryPanel from './ui/SubmissionHistoryPanel';
 
@@ -32,6 +32,10 @@ const AssignmentSubmitPage = () => {
     initialCodeId
   );
 
+  useEffect(() => {
+    setCurrentCodeId(initialCodeId);
+  }, [assignmentId]);
+
   const [{data: assignment}, {data: courseDetails}] = useSuspenseQueries({
     queries: [
       assignmentQueries.getAssignment(Number(assignmentId)),