diff --git a/simpleAPI/simpleAPI_mqtt.py b/simpleAPI/simpleAPI_mqtt.py
index e41235694e..62083881d2 100755
--- a/simpleAPI/simpleAPI_mqtt.py
+++ b/simpleAPI/simpleAPI_mqtt.py
@@ -545,7 +545,12 @@ def _set_chargemode(self, chargepoint_id: str, mode: str):
             'pv': 'pv_charging',
             'eco': 'eco_charging',
             'stop': 'stop',
-            'target': 'scheduled_charging'
+            'target': 'scheduled_charging',
+            # Support full names directly
+            'instant_charging': 'instant_charging',
+            'pv_charging': 'pv_charging',
+            'eco_charging': 'eco_charging',
+            'scheduled_charging': 'scheduled_charging'
         }
 
         if mode not in mode_mapping:
diff --git a/simpleAPI/src/ParameterHandler.php b/simpleAPI/src/ParameterHandler.php
index 7244c2c024..cc18b1edab 100644
--- a/simpleAPI/src/ParameterHandler.php
+++ b/simpleAPI/src/ParameterHandler.php
@@ -772,13 +772,18 @@ private function getCounter($id)
      */
     private function setChargemode($chargepointId, $mode)
     {
-        // Gültige Modi mapping
+        // Gültige Modi mapping (sowohl kurze als auch vollständige Namen)
         $validModes = [
             'instant' => 'instant_charging',
             'pv' => 'pv_charging',
             'eco' => 'eco_charging',
             'stop' => 'stop',
-            'target' => 'scheduled_charging'
+            'target' => 'scheduled_charging',
+            // Vollständige Namen direkt unterstützen
+            'instant_charging' => 'instant_charging',
+            'pv_charging' => 'pv_charging',
+            'eco_charging' => 'eco_charging',
+            'scheduled_charging' => 'scheduled_charging'
         ];
 
         if (!isset($validModes[$mode])) {