diff --git a/src/components/Controls/CarSelectionTable/index.jsx b/src/components/Controls/CarSelectionTable/index.jsx
index 30afee4..800659d 100644
--- a/src/components/Controls/CarSelectionTable/index.jsx
+++ b/src/components/Controls/CarSelectionTable/index.jsx
@@ -48,7 +48,15 @@ const tableColumns = [
 ];
 
 const CarSelectionTable = (props) => {
-  const { token, classes, search, multiSelect, selected, onSelect, onSelectAll } = props;
+  const {
+    token,
+    classes,
+    search,
+    multiSelect,
+    selected,
+    onSelect,
+    onSelectAll,
+  } = props;
   const [pageSize, setPageSize] = useState(10);
   const [pageIndex, setPageIndex] = useState(0);
   const [orderBy, setOrderBy] = useState("vin");
@@ -126,19 +134,23 @@ const CarSelectionTable = (props) => {
           multiSelect={multiSelect}
           onSelectAll={handleSelectAll}
           selectCount={selected ? selected.length : 0}
-          rowCount={vehicles.length}
+          rowCount={vehicles ? vehicles.length : 0}
         />
         <TableBody>
           {vehicles.map((row) => {
-            const isSelected = selected ? selected.indexOf(row.vin) !== -1 : false;
+            const isSelected = selected
+              ? selected.indexOf(row.vin) !== -1
+              : false;
             return (
               <TableRow key={row.vin}>
-                {multiSelect && (<TableCell padding="checkbox">
-                  <Checkbox
-                    checked={isSelected}
-                    onChange={(event) => handleSelect(event, row.vin)}
-                  />
-                </TableCell>)}
+                {multiSelect && (
+                  <TableCell padding="checkbox">
+                    <Checkbox
+                      checked={isSelected}
+                      onChange={(event) => handleSelect(event, row.vin)}
+                    />
+                  </TableCell>
+                )}
                 <TableCell align="center">
                   <ConnectedIcon
                     connected={row.connected}