diff --git a/reading-platform-java/src/main/java/com/reading/platform/controller/admin/AdminCourseController.java b/reading-platform-java/src/main/java/com/reading/platform/controller/admin/AdminCourseController.java
index 0467b2c..84e99b4 100644
--- a/reading-platform-java/src/main/java/com/reading/platform/controller/admin/AdminCourseController.java
+++ b/reading-platform-java/src/main/java/com/reading/platform/controller/admin/AdminCourseController.java
@@ -27,10 +27,8 @@ public class AdminCourseController {
     @Operation(summary = "Create system course")
     @PostMapping
     public Result<Course> createCourse(@Valid @RequestBody CourseCreateRequest request) {
-        // System courses have null tenantId
-        Course course = courseService.createCourse(null, request);
-        course.setIsSystem(1);
-        return Result.success(course);
+        // System courses have null tenantId; service sets isSystem=1 when tenantId is null
+        return Result.success(courseService.createCourse(null, request));
     }
 
     @Operation(summary = "Update course")
diff --git a/reading-platform-java/src/main/java/com/reading/platform/service/impl/CourseServiceImpl.java b/reading-platform-java/src/main/java/com/reading/platform/service/impl/CourseServiceImpl.java
index dec9bb2..51c6af3 100644
--- a/reading-platform-java/src/main/java/com/reading/platform/service/impl/CourseServiceImpl.java
+++ b/reading-platform-java/src/main/java/com/reading/platform/service/impl/CourseServiceImpl.java
@@ -42,7 +42,7 @@ public class CourseServiceImpl implements CourseService {
         course.setDurationMinutes(request.getDurationMinutes());
         course.setObjectives(request.getObjectives());
         course.setStatus("draft");
-        course.setIsSystem(0);
+        course.setIsSystem(tenantId == null ? 1 : 0);
 
         // Course Package Fields
         course.setCoreContent(request.getCoreContent());