diff --git a/server/http_handler.go b/server/http_handler.go
index 5e67cde61..275543a3f 100644
--- a/server/http_handler.go
+++ b/server/http_handler.go
@@ -314,7 +314,11 @@ func targetChargeHandler(loadpoint targetCharger) http.HandlerFunc {
 // targetChargeRemoveHandler removes target soc
 func targetChargeRemoveHandler(loadpoint loadpoint.API) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		loadpoint.SetTargetCharge(time.Time{}, 0)
+		if err := loadpoint.SetTargetCharge(time.Time{}, 0); err != nil {
+			jsonError(w, http.StatusBadRequest, err)
+			return
+		}
+
 		res := struct{}{}
 		jsonResult(w, res)
 	}