diff --git a/package-lock.json b/package-lock.json
index 161376d..e243331 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7362,9 +7362,9 @@
       "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
     },
     "node_modules/ejs": {
-      "version": "3.1.9",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.9.tgz",
-      "integrity": "sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==",
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
+      "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
       "dependencies": {
         "jake": "^10.8.5"
       },
@@ -22471,9 +22471,9 @@
       "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
     },
     "ejs": {
-      "version": "3.1.9",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.9.tgz",
-      "integrity": "sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==",
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
+      "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
       "requires": {
         "jake": "^10.8.5"
       }
diff --git a/src/components/Fleets/Status/Vehicles/Table/index.jsx b/src/components/Fleets/Status/Vehicles/Table/index.jsx
index fd8761b..f152ff5 100644
--- a/src/components/Fleets/Status/Vehicles/Table/index.jsx
+++ b/src/components/Fleets/Status/Vehicles/Table/index.jsx
@@ -214,53 +214,51 @@ const MainForm = ({ name }) => {
           selectCount={selected.length}
           rowCount={fleetVehicles.length}
         />
-        <VehicleProvider>
-          <TableBody>
-            {fleetVehicles && fleetVehicles.map((car) => {
-              const isSelected = selected.includes(car.vin);
-              return (car.vin && <TableRow key={"row" + car.vin}>
-                <TableCell padding="checkbox">
-                  <Checkbox
-                    checked={isSelected}
-                    onChange={() => handleSelect(car.vin, !isSelected)}
-                  />
-                </TableCell>
-                <TableCell key={"cell" + car.vin} align="center">
-                  <VehicleTeaser
-                    vin={car.vin}
-                    icc={car.connectedHMI}
-                    trex={car.connected}
-                    token={token}
-                  />
-                </TableCell>
-                <TableCell key={"cell2" + car.vin} align="center">{car.trex_version}</TableCell>
-                <TableCell key={"cell3" + car.car_update_name}>
-                  <Tooltip key={"cell3tooltip"} title={`${car.car_update_id} / ${car.car_update_type}`}>
-                    <Link to={`/vehicle-status/${car.vin}/${car.car_update_id}`} className={classes.truncateCell}>
-                      {car.car_update_name}
-                    </Link>
-                  </Tooltip>
-                </TableCell>
-                <TableCell key={"cell4" + car.vin}>
-                  {car.car_update_status}
-                  {car.car_update_progress > -1 && (
-                    <LinearProgress variant="determinate" value={car.car_update_progress} />
-                  )}
-                </TableCell>
-                <TableCell key={"cell5" + car.vin} align="left">
-                  <Battery percent={car.charge} charge={car.charge_type} />
-                </TableCell>
-                <TableCell key={"cell6" + car.vin}>
-                  {car.voltage > 0 && `${car.voltage}V`}
-                </TableCell>
-                <TableCell key={"cell7" + car.vin}>
-                  {car.park ? "Yes" : "No"}
-                </TableCell>
-              </TableRow>
-              )
-            })}
-          </TableBody>
-        </VehicleProvider>
+        <TableBody>
+          {fleetVehicles && fleetVehicles.map((car) => {
+            const isSelected = selected.includes(car.vin);
+            return (car.vin && <TableRow key={"row" + car.vin}>
+              <TableCell padding="checkbox">
+                <Checkbox
+                  checked={isSelected}
+                  onChange={() => handleSelect(car.vin, !isSelected)}
+                />
+              </TableCell>
+              <TableCell key={"cell" + car.vin} align="center">
+                <VehicleTeaser
+                  vin={car.vin}
+                  icc={car.connectedHMI}
+                  trex={car.connected}
+                  token={token}
+                />
+              </TableCell>
+              <TableCell key={"cell2" + car.vin} align="center">{car.trex_version}</TableCell>
+              <TableCell key={"cell3" + car.car_update_name}>
+                <Tooltip key={"cell3tooltip"} title={`${car.car_update_id} / ${car.car_update_type}`}>
+                  <Link to={`/vehicle-status/${car.vin}/${car.car_update_id}`} className={classes.truncateCell}>
+                    {car.car_update_name}
+                  </Link>
+                </Tooltip>
+              </TableCell>
+              <TableCell key={"cell4" + car.vin}>
+                {car.car_update_status}
+                {car.car_update_progress > -1 && (
+                  <LinearProgress variant="determinate" value={car.car_update_progress} />
+                )}
+              </TableCell>
+              <TableCell key={"cell5" + car.vin} align="left">
+                <Battery percent={car.charge} charge={car.charge_type} />
+              </TableCell>
+              <TableCell key={"cell6" + car.vin}>
+                {car.voltage > 0 && `${car.voltage}V`}
+              </TableCell>
+              <TableCell key={"cell7" + car.vin}>
+                {car.park ? "Yes" : "No"}
+              </TableCell>
+            </TableRow>
+            )
+          })}
+        </TableBody>
         <TableFooter>
           <TableRow>
             <TablePagination
diff --git a/src/components/VehicleTeaser/index.jsx b/src/components/VehicleTeaser/index.jsx
index 011f3f3..824ee26 100644
--- a/src/components/VehicleTeaser/index.jsx
+++ b/src/components/VehicleTeaser/index.jsx
@@ -3,9 +3,9 @@ import { Link } from "react-router-dom";
 import Chip from '@mui/material/Chip';
 import Stack from '@mui/material/Stack';
 import ConnectedIcon from "../Controls/ConnectedIcon";
-import { useVehicleContext } from "../Contexts/VehicleContext";
 import useStyles from "../useStyles";
 import { useIntersectObserver } from "../../hooks";
+import api from "../../services/vehiclesAPI";
 
 // Prevent fetching missing data by not including `token` prop
 
@@ -13,8 +13,7 @@ export function VehicleTeaserController(props) {
   const el = useRef(null);
   const isVisible = useIntersectObserver(el, "0px", true);
   const [isMissingData, setIsMissingData] = useState(false);
-
-  const { getVehicle, vehicle } = useVehicleContext();
+  const [vehicle, setVehicle] = useState({});
 
   const classes = useStyles();
 
@@ -26,7 +25,9 @@ export function VehicleTeaserController(props) {
 
   useEffect(() => {
     if (isVisible && props.token) {
-      getVehicle(props.vin, props.token)
+      api.getVehicle(props.vin, props.token)
+        .then(setVehicle)
+        .catch(() => setVehicle({}));
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isMissingData, isVisible, props.vin, props.token]);