diff --git a/apiserver/apiserver/api/serializers.py b/apiserver/apiserver/api/serializers.py
index 90810df..2c50dca 100644
--- a/apiserver/apiserver/api/serializers.py
+++ b/apiserver/apiserver/api/serializers.py
@@ -255,14 +255,14 @@ class SessionListSerializer(SessionSerializer):
 
 
 class CourseSerializer(serializers.ModelSerializer):
-    name = serializers.CharField()
     class Meta:
         model = models.Course
         fields = ['id', 'name']
 
 class CourseDetailSerializer(serializers.ModelSerializer):
     sessions = SessionListSerializer(many=True, read_only=True)
-    description = HTMLField()
+    name = serializers.CharField(max_length=100)
+    description = HTMLField(max_length=6000)
     class Meta:
         model = models.Course
         fields = '__all__'
diff --git a/webclient/src/Instructor.js b/webclient/src/Instructor.js
index a5cc484..bc4ec0d 100644
--- a/webclient/src/Instructor.js
+++ b/webclient/src/Instructor.js
@@ -44,7 +44,7 @@ function InstructorCourseEditor(props) {
 			/>
 
 			<Form.Field>
-				<label>Description</label>
+				<label>Description — {input.description ? input.description.length : 0}/6000</label>
 				<ReactQuill
 					value={input.description || ''}
 					modules={modules}