diff --git a/core/loadpoint.go b/core/loadpoint.go
index fe9768df0..887fae4fb 100644
--- a/core/loadpoint.go
+++ b/core/loadpoint.go
@@ -143,8 +143,8 @@ func (lp *LoadPoint) evChargeCurrentHandler(m *wrapper.ChargeMeter) func(para ..
 			current = 0
 		}
 		if current > 0 {
-			// limit available power to generation minus delivery
-			availablePower := math.Abs(lp.pvPower) + math.Min(0, lp.gridPower)
+			// limit available power to generation plus consumption/ minus delivery
+			availablePower := math.Abs(lp.pvPower) + lp.gridPower
 			availableCurrent := int64(powerToCurrent(availablePower, lp.Voltage, lp.Phases))
 			current = min(current, availableCurrent)
 		}
diff --git a/push/telegram.go b/push/telegram.go
index 93d680029..12404d11f 100644
--- a/push/telegram.go
+++ b/push/telegram.go
@@ -19,7 +19,9 @@ type telegramConfig struct {
 }
 
 func init() {
-	tgbotapi.SetLogger(log.ERROR)
+	if err := tgbotapi.SetLogger(log.ERROR); err != nil {
+		log.ERROR.Printf("telegram: %v", err)
+	}
 }
 
 // NewTelegramMessenger creates new pushover messenger