diff --git a/keba/integrationpluginkeba.cpp b/keba/integrationpluginkeba.cpp
index 96ee27f0..837f3bbf 100644
--- a/keba/integrationpluginkeba.cpp
+++ b/keba/integrationpluginkeba.cpp
@@ -424,7 +424,10 @@ void IntegrationPluginKeba::onReportTwoReceived(const KeContact::ReportTwo &repo
         thing->setStateValue(wallboxMaxChargingCurrentStateTypeId, reportTwo.currTimer);
         thing->setStateValue(wallboxMaxChargingCurrentGeneralStateTypeId, reportTwo.currentUser);
         thing->setStateValue(wallboxMaxChargingCurrentPercentStateTypeId, reportTwo.maxCurrentPercentage);
-        thing->setStateValue(wallboxMaxPossibleChargingCurrentStateTypeId, reportTwo.currentHardwareLimitation);
+
+        // Set the state limits according to the hardware limits
+        thing->setStateMaxValue(wallboxMaxChargingCurrentStateTypeId, reportTwo.currentHardwareLimitation);
+        thing->setStateMaxValue(wallboxMaxChargingCurrentGeneralStateTypeId, reportTwo.currentHardwareLimitation);
 
         thing->setStateValue(wallboxOutputX2StateTypeId, reportTwo.output);
         thing->setStateValue(wallboxInputStateTypeId, reportTwo.input);
@@ -459,6 +462,7 @@ void IntegrationPluginKeba::onReportThreeReceived(const KeContact::ReportThree &
         thing->setStateValue(wallboxCurrentPhase1EventTypeId, reportThree.currentPhase1);
         thing->setStateValue(wallboxCurrentPhase2EventTypeId, reportThree.currentPhase2);
         thing->setStateValue(wallboxCurrentPhase3EventTypeId, reportThree.currentPhase3);
+        thing->setStateValue(wallboxCurrentStateTypeId, reportThree.currentPhase1 + reportThree.currentPhase2 + reportThree.currentPhase3);
         thing->setStateValue(wallboxVoltagePhase1EventTypeId, reportThree.voltagePhase1);
         thing->setStateValue(wallboxVoltagePhase2EventTypeId, reportThree.voltagePhase2);
         thing->setStateValue(wallboxVoltagePhase3EventTypeId, reportThree.voltagePhase3);
diff --git a/keba/integrationpluginkeba.json b/keba/integrationpluginkeba.json
index 214b42bc..4caaccca 100644
--- a/keba/integrationpluginkeba.json
+++ b/keba/integrationpluginkeba.json
@@ -177,15 +177,6 @@
                             "maxValue": 100,
                             "suggestLogging": true
                         },
-                        {
-                            "id": "08bb9872-8d63-49b0-a8ce-7a449341f13b",
-                            "name": "maxPossibleChargingCurrent",
-                            "displayName": "Maximum possible charging current",
-                            "displayNameEvent": "Maximum possible charging current changed",
-                            "type": "double",
-                            "unit": "Ampere",
-                            "defaultValue": 6.00
-                        },
                         {
                             "id": "4a2d75d8-a3a0-4b40-9ca7-e8b6f11d0ef9",
                             "name": "voltagePhase1",