diff --git a/src/main/java/org/olat/course/run/scoring/ScoreCalculator.java b/src/main/java/org/olat/course/run/scoring/ScoreCalculator.java
index 87b06fcd10deba288a0daa9a1dda82efdfc0ddab..10d34ea998e54f78074c07be18b3f6da31f30fb5 100644
--- a/src/main/java/org/olat/course/run/scoring/ScoreCalculator.java
+++ b/src/main/java/org/olat/course/run/scoring/ScoreCalculator.java
@@ -111,11 +111,11 @@ public class ScoreCalculator implements Serializable {
 	 * @return 
 	 */
 	public String getScoreExpressionFromEasyModeConfiguration() {
-		if (getSumOfScoreNodes() != null && getSumOfScoreNodes().size() > 0) {
-			switch (scoreType) {
-			case SCORE_TYPE_SUM: return getSumScoreExpression();
-			case SCORE_TYPE_AVG: return getAvgScoreExpression();
-			default: //
+		if (getSumOfScoreNodes() != null && !getSumOfScoreNodes().isEmpty()) {
+			if(scoreType == null || SCORE_TYPE_SUM.equals(scoreType)) {
+				return getSumScoreExpression();
+			} else if(SCORE_TYPE_AVG.equals(scoreType)) {
+				return getAvgScoreExpression();
 			}
 		}
 		return null;