diff --git a/erpnext/public/js/education/lms/components/ProgramCard.vue b/erpnext/public/js/education/lms/components/ProgramCard.vue
index 53905aa..bbe6ba5 100644
--- a/erpnext/public/js/education/lms/components/ProgramCard.vue
+++ b/erpnext/public/js/education/lms/components/ProgramCard.vue
@@ -45,7 +45,7 @@
                 program_name: this.program.name,
             }).then(data => {
                 console.log(data)
-                lms.store.enrolledPrograms.add(data),
+                lms.store.updateEnrolledPrograms()
                 this.$router.push(this.programRoute)
             })
         }
diff --git a/erpnext/public/js/education/lms/lms.js b/erpnext/public/js/education/lms/lms.js
index 8914e7b..d45b4ef 100644
--- a/erpnext/public/js/education/lms/lms.js
+++ b/erpnext/public/js/education/lms/lms.js
@@ -23,17 +23,19 @@
 			updateEnrolledPrograms() {
 				if(this.isLogin) {
 					lms.call("get_program_enrollments").then(data => {
-						if(data) this.enrolledPrograms = data
+						this.enrolledPrograms = data
 					});
 					if (lms.debug) console.log('Updated Enrolled Programs', this.enrolledPrograms)
 				}
 			},
 
 			updateEnrolledCourses() {
-				lms.call("get_all_course_enrollments").then(data => {
-					if(data) this.enrolledCourses = data
-				})
-				if (lms.debug) console.log('Updated Enrolled Courses', this.enrolledCourses)
+				if(this.isLogin) {
+					lms.call("get_all_course_enrollments").then(data => {
+						this.enrolledCourses = data
+					})
+					if (lms.debug) console.log('Updated Enrolled Courses', this.enrolledCourses)
+				}
 			},
 
 			checkLogin() {
