diff --git a/io.openems.edge.battery.pylontech/src/io/openems/edge/battery/pylontech/powercubem2/PylontechPowercubeM2BatteryImpl.java b/io.openems.edge.battery.pylontech/src/io/openems/edge/battery/pylontech/powercubem2/PylontechPowercubeM2BatteryImpl.java
index 4f276aa08b..654257b0be 100644
--- a/io.openems.edge.battery.pylontech/src/io/openems/edge/battery/pylontech/powercubem2/PylontechPowercubeM2BatteryImpl.java
+++ b/io.openems.edge.battery.pylontech/src/io/openems/edge/battery/pylontech/powercubem2/PylontechPowercubeM2BatteryImpl.java
@@ -373,22 +373,16 @@ public void setStartStop(StartStop value) throws OpenemsNamedException {
 
 	@Override
 	public StartStop getStartStopTarget() {
-		switch (this.config.startStop()) {
-		case AUTO:
-			// read StartStop-Channel
-			return this.startStopTarget.get();
-
-		case START:
-			// force START
-			return StartStop.START;
-
-		case STOP:
-			// force STOP
-			return StartStop.STOP;
-		}
+		return switch (this.config.startStop()) {
+		    case AUTO -> this.startStopTarget.get(); // read StartStop-Channel
+		    case START -> StartStop.START;          // force START
+		    case STOP -> StartStop.STOP;            // force STOP
+		    default -> {
+		        assert false : "Unexpected startStop value";
+		        yield StartStop.UNDEFINED;          // can never happen
+		    }
+	};
 
-		assert false;
-		return StartStop.UNDEFINED; // can never happen
 	}
 
 	@Override