diff --git a/src/components/GenerateCourse/AICourse.tsx b/src/components/GenerateCourse/AICourse.tsx
index 5fce355b4..3443d7da6 100644
--- a/src/components/GenerateCourse/AICourse.tsx
+++ b/src/components/GenerateCourse/AICourse.tsx
@@ -6,6 +6,7 @@ import { showLoginPopup } from '../../lib/popup';
 import { UserCoursesList } from './UserCoursesList';
 import { FineTuneCourse } from './FineTuneCourse';
 import {
+  clearFineTuneData,
   getCourseFineTuneData,
   getLastSessionId,
   storeFineTuneData,
@@ -40,9 +41,9 @@ export function AICourse(props: AICourseProps) {
       return;
     }
 
-    // setAbout(fineTuneData.about);
-    // setGoal(fineTuneData.goal);
-    // setCustomInstructions(fineTuneData.customInstructions);
+    setAbout(fineTuneData.about);
+    setGoal(fineTuneData.goal);
+    setCustomInstructions(fineTuneData.customInstructions);
   }, []);
 
   const handleKeyDown = (e: React.KeyboardEvent) => {
@@ -57,13 +58,15 @@ export function AICourse(props: AICourseProps) {
       return;
     }
 
-    const sessionId = hasFineTuneData
-      ? storeFineTuneData({
-          about,
-          goal,
-          customInstructions,
-        })
-      : '';
+    let sessionId = '';
+    if (hasFineTuneData) {
+      clearFineTuneData();
+      sessionId = storeFineTuneData({
+        about,
+        goal,
+        customInstructions,
+      });
+    }
 
     window.location.href = `/ai-tutor/search?term=${encodeURIComponent(keyword)}&difficulty=${difficulty}&id=${sessionId}`;
   }
diff --git a/src/lib/ai.ts b/src/lib/ai.ts
index a76337636..ac9bf1d9e 100644
--- a/src/lib/ai.ts
+++ b/src/lib/ai.ts
@@ -64,8 +64,8 @@ type CourseFineTuneData = {
 export function storeFineTuneData(meta: CourseFineTuneData) {
   const sessionId = Date.now().toString();
 
-  sessionStorage.setItem(sessionId, JSON.stringify(meta));
-  sessionStorage.setItem('lastSessionId', sessionId);
+  localStorage.setItem(sessionId, JSON.stringify(meta));
+  localStorage.setItem('lastSessionId', sessionId);
 
   return sessionId;
 }
@@ -73,7 +73,7 @@ export function storeFineTuneData(meta: CourseFineTuneData) {
 export function getCourseFineTuneData(
   sessionId: string,
 ): CourseFineTuneData | null {
-  const meta = sessionStorage.getItem(sessionId);
+  const meta = localStorage.getItem(sessionId);
   if (!meta) {
     return null;
   }
@@ -82,16 +82,16 @@ export function getCourseFineTuneData(
 }
 
 export function getLastSessionId(): string | null {
-  return sessionStorage.getItem('lastSessionId');
+  return localStorage.getItem('lastSessionId');
 }
 
 export function clearFineTuneData() {
   const sessionId = getLastSessionId();
   if (sessionId) {
-    sessionStorage.removeItem(sessionId);
+    localStorage.removeItem(sessionId);
   }
 
-  sessionStorage.removeItem('lastSessionId');
+  localStorage.removeItem('lastSessionId');
 }
 
 const NEW_LINE = '\n'.charCodeAt(0);