diff --git a/src/main/java/org/olat/admin/version/VersionSettingsForm.java b/src/main/java/org/olat/admin/version/VersionSettingsForm.java
index 20c0121a42f3aa8c7831aeabead449513d32378d..76b7a06257423a24299c89607410ac90d7a93029 100644
--- a/src/main/java/org/olat/admin/version/VersionSettingsForm.java
+++ b/src/main/java/org/olat/admin/version/VersionSettingsForm.java
@@ -79,8 +79,10 @@ public class VersionSettingsForm extends FormBasicController {
 		Long maxNumber = getNumOfVersions();
 		if(maxNumber == null) {
 			numOfVersions.select("0", true);
+		} else if (maxNumber.longValue() == 0l) {
+			numOfVersions.select("0", true); // deactivated
 		} else if (maxNumber.longValue() == -1l) {
-			numOfVersions.select("-1", true);
+			numOfVersions.select("-1", true); // unlimited
 		} else {
 			String str = maxNumber.toString();
 			boolean found = false;