diff --git a/JavaSource/org/unitime/timetable/server/courses/ClassSetupBackend.java b/JavaSource/org/unitime/timetable/server/courses/ClassSetupBackend.java
index d49bd8342a..be3a12131a 100644
--- a/JavaSource/org/unitime/timetable/server/courses/ClassSetupBackend.java
+++ b/JavaSource/org/unitime/timetable/server/courses/ClassSetupBackend.java
@@ -674,8 +674,7 @@ private void addOrUpdateClasses(ClassSetupInterface form, InstrOfferingConfig io
 					changed = true;
 					modifiedClass.setEnabledForStudentScheduling(enabledForStudentScheduling);
 				}
-				if (suffix != null) {
-					if (suffix.isEmpty()) suffix = null;
+				if (form.isEditExternalId()) {
 					if (suffix == null ? modifiedClass.getClassSuffix() != null : !suffix.equals(modifiedClass.getClassSuffix())) {
 						modifiedClass.setClassSuffix(suffix);
 						changed = true;
diff --git a/WebContent/help/Release-Notes.xml b/WebContent/help/Release-Notes.xml
index 93b1265a93..7086ae5c64 100644
--- a/WebContent/help/Release-Notes.xml
+++ b/WebContent/help/Release-Notes.xml
@@ -35,6 +35,7 @@
 			<description>
 				<line>Added column with the capacity of the assigned room (Cap).</line>
 				<line>Added mouse-over for assigned rooms.</line>
+				<line>Fixed the ability to clear External Id (when modification of external ids is allowed).</line>
 			</description>
 		</item>
 	</category>