diff --git a/src/main/java/org/olat/course/highscore/ui/HighScoreEditController.java b/src/main/java/org/olat/course/highscore/ui/HighScoreEditController.java
index 5c5c12e18fa7e17b303fea51c23089422ea98aa6..e66df6649412d87824cd32f4cdc53d2a7d970462 100644
--- a/src/main/java/org/olat/course/highscore/ui/HighScoreEditController.java
+++ b/src/main/java/org/olat/course/highscore/ui/HighScoreEditController.java
@@ -267,8 +267,13 @@ public class HighScoreEditController extends FormBasicController {
 		config.set(CONFIG_KEY_DATESTART, dateStart.getDate());
 		config.set(CONFIG_KEY_ANONYMIZE, displayAnonymous.isSelected(0));
 		if (showListing.isSelected(0)) {
-			config.set(CONFIG_KEY_BESTONLY, bestOnlyEl.getSelected());
-			config.set(CONFIG_KEY_NUMUSER, numTableRows.getIntValue());
+			int bestOnly = bestOnlyEl.getSelected();
+			config.set(CONFIG_KEY_BESTONLY, bestOnly);
+			if(bestOnly == 1) {
+				config.set(CONFIG_KEY_NUMUSER, numTableRows.getIntValue());
+			} else {
+				config.remove(CONFIG_KEY_NUMUSER);
+			}
 		}
 		fireEvent(ureq, Event.DONE_EVENT);
 	}