diff --git a/server/http_handler.go b/server/http_handler.go
index 3c64521a0..b41f782e8 100644
--- a/server/http_handler.go
+++ b/server/http_handler.go
@@ -356,12 +356,13 @@ func vehicleHandler(site site.API, loadpoint loadpoint.API) http.HandlerFunc {
 			return
 		}
 
-		loadpoint.SetVehicle(vehicles[val-1])
+		v := vehicles[val-1]
+		loadpoint.SetVehicle(v)
 
 		res := struct {
 			Vehicle string `json:"vehicle"`
 		}{
-			Vehicle: vehicles[val].Title(),
+			Vehicle: v.Title(),
 		}
 
 		jsonResult(w, res)