diff --git a/assets/js/components/VehicleStatus.vue b/assets/js/components/VehicleStatus.vue
index c5718dfad..54fe4e35d 100644
--- a/assets/js/components/VehicleStatus.vue
+++ b/assets/js/components/VehicleStatus.vue
@@ -270,7 +270,7 @@ export default {
 		},
 		vehicleLimitVisible() {
 			const limit = this.effectiveLimitSoc || 100;
-			return this.vehicleLimitSoc > 0 && this.vehicleLimitSoc < limit;
+			return this.connected && this.vehicleLimitSoc > 0 && this.vehicleLimitSoc < limit;
 		},
 		vehicleLimitTooltipContent() {
 			if (!this.vehicleLimitVisible) {
@@ -285,7 +285,7 @@ export default {
 			return this.$t("main.vehicleStatus.vehicleLimit");
 		},
 		minSocVisible() {
-			return this.minSoc > 0 && this.vehicleSoc < this.minSoc;
+			return this.connected && this.minSoc > 0 && this.vehicleSoc < this.minSoc;
 		},
 		minSocTooltipContent() {
 			if (!this.minSocVisible) {
@@ -539,8 +539,8 @@ export default {
 			}
 		},
 		smartCostClicked() {
-			this.smartCostTooltip?.hide();
 			this.openLoadpointSettings();
+			this.smartCostTooltip?.hide();
 		},
 		updatePvTooltip() {
 			this.pvTooltip = this.updateTooltip(
diff --git a/core/site_battery.go b/core/site_battery.go
index 3103c6588..3804aebc9 100644
--- a/core/site_battery.go
+++ b/core/site_battery.go
@@ -66,7 +66,7 @@ func (site *Site) plannerRates() (api.Rates, error) {
 
 func (site *Site) plannerRate() (*api.Rate, error) {
 	rates, err := site.plannerRates()
-	if err != nil {
+	if rates == nil || err != nil {
 		return nil, err
 	}