diff --git a/src/components/App/__snapshots__/App.test.js.snap b/src/components/App/__snapshots__/App.test.js.snap
index 348551e..3ecf212 100644
--- a/src/components/App/__snapshots__/App.test.js.snap
+++ b/src/components/App/__snapshots__/App.test.js.snap
@@ -2639,124 +2639,8 @@ exports[`App Route /issues authenticated 1`] = `
                     <tr
                       class="MuiTableRow-root MuiTableRow-footer"
                     >
-                      <td
-                        class="MuiTableCell-root MuiTableCell-footer MuiTablePagination-root"
-                        colspan="7"
-                      >
-                        <div
-                          class="MuiToolbar-root MuiToolbar-regular MuiTablePagination-toolbar MuiToolbar-gutters"
-                        >
-                          <div
-                            class="MuiTablePagination-spacer"
-                          />
-                          <p
-                            class="MuiTypography-root MuiTablePagination-caption MuiTypography-body2 MuiTypography-colorInherit"
-                            id="mui-0"
-                          >
-                            Rows per page:
-                          </p>
-                          <div
-                            class="MuiInputBase-root MuiTablePagination-input MuiTablePagination-selectRoot"
-                          >
-                            <select
-                              aria-label="rows per page"
-                              class="MuiSelect-root MuiSelect-select MuiTablePagination-select MuiInputBase-input"
-                              id="mui-0"
-                            >
-                              <option
-                                class="MuiTablePagination-menuItem"
-                                value="5"
-                              >
-                                5
-                              </option>
-                              <option
-                                class="MuiTablePagination-menuItem"
-                                value="10"
-                              >
-                                10
-                              </option>
-                              <option
-                                class="MuiTablePagination-menuItem"
-                                value="25"
-                              >
-                                25
-                              </option>
-                              <option
-                                class="MuiTablePagination-menuItem"
-                                value="100"
-                              >
-                                100
-                              </option>
-                            </select>
-                            <svg
-                              aria-hidden="true"
-                              class="MuiSvgIcon-root MuiSelect-icon MuiTablePagination-selectIcon"
-                              focusable="false"
-                              viewBox="0 0 24 24"
-                            >
-                              <path
-                                d="M7 10l5 5 5-5z"
-                              />
-                            </svg>
-                          </div>
-                          <p
-                            class="MuiTypography-root MuiTablePagination-caption MuiTypography-body2 MuiTypography-colorInherit"
-                          >
-                            1-NaN of undefined
-                          </p>
-                          <div
-                            class="MuiTablePagination-actions"
-                          >
-                            <button
-                              aria-label="Previous page"
-                              class="MuiButtonBase-root MuiIconButton-root MuiIconButton-colorInherit Mui-disabled Mui-disabled"
-                              disabled=""
-                              tabindex="-1"
-                              title="Previous page"
-                              type="button"
-                            >
-                              <span
-                                class="MuiIconButton-label"
-                              >
-                                <svg
-                                  aria-hidden="true"
-                                  class="MuiSvgIcon-root"
-                                  focusable="false"
-                                  viewBox="0 0 24 24"
-                                >
-                                  <path
-                                    d="M15.41 16.09l-4.58-4.59 4.58-4.59L14 5.5l-6 6 6 6z"
-                                  />
-                                </svg>
-                              </span>
-                            </button>
-                            <button
-                              aria-label="Next page"
-                              class="MuiButtonBase-root MuiIconButton-root MuiIconButton-colorInherit"
-                              tabindex="0"
-                              title="Next page"
-                              type="button"
-                            >
-                              <span
-                                class="MuiIconButton-label"
-                              >
-                                <svg
-                                  aria-hidden="true"
-                                  class="MuiSvgIcon-root"
-                                  focusable="false"
-                                  viewBox="0 0 24 24"
-                                >
-                                  <path
-                                    d="M8.59 16.34l4.58-4.59-4.58-4.59L10 5.75l6 6-6 6z"
-                                  />
-                                </svg>
-                              </span>
-                              <span
-                                class="MuiTouchRipple-root"
-                              />
-                            </button>
-                          </div>
-                        </div>
+                      <td>
+                        No issues found
                       </td>
                     </tr>
                   </tfoot>
diff --git a/src/components/Cars/Status/__snapshots__/CarUpdatesTab.test.jsx.snap b/src/components/Cars/Status/__snapshots__/CarUpdatesTab.test.jsx.snap
index 7468285..d4fb153 100644
--- a/src/components/Cars/Status/__snapshots__/CarUpdatesTab.test.jsx.snap
+++ b/src/components/Cars/Status/__snapshots__/CarUpdatesTab.test.jsx.snap
@@ -164,9 +164,9 @@ exports[`CarUpdatesTab Render 1`] = `
               <tr
                 class="MuiTableRow-root MuiTableRow-footer"
               >
-                <p>
+                <td>
                   No Car Updates found
-                </p>
+                </td>
               </tr>
             </tfoot>
           </table>
diff --git a/src/components/Controls/CarUpdatesTable/index.jsx b/src/components/Controls/CarUpdatesTable/index.jsx
index 19882c9..4ea66ca 100644
--- a/src/components/Controls/CarUpdatesTable/index.jsx
+++ b/src/components/Controls/CarUpdatesTable/index.jsx
@@ -198,7 +198,7 @@ const MainForm = ({ vin, token }) => {
       <TableFooter>
         <TableRow>
         {totalCarUpdates === 0 ? (
-          <p>No Car Updates found</p>
+          <td>No Car Updates found</td>
           ) : (
           <TablePagination
             rowsPerPageOptions={[5, 10, 25, 100]}
diff --git a/src/components/Controls/IssueSelectionTable/index.jsx b/src/components/Controls/IssueSelectionTable/index.jsx
index 3dc8c5f..7dc40cb 100644
--- a/src/components/Controls/IssueSelectionTable/index.jsx
+++ b/src/components/Controls/IssueSelectionTable/index.jsx
@@ -69,7 +69,7 @@ const IssueSelectionTable = (props) => {
   const [pageIndex, setPageIndex] = useState(0);
   const [orderBy, setOrderBy] = useState("created_at");
   const [order, setOrder] = useState("asc");
-  const { getIssues, issues, totalIssues } = useIssueContext();
+  const { getIssues, issues, totalIssues = 0 } = useIssueContext();
   const { groups, providers } = useUserContext();
   const { setMessage } = useStatusContext();
 
@@ -182,7 +182,7 @@ const IssueSelectionTable = (props) => {
         <TableFooter>
           <TableRow>
               {totalIssues === 0 ? (
-                <p>No issues found</p>
+                <td>No issues found</td>
               ) : (
               <TablePagination
                 rowsPerPageOptions={[5, 10, 25, 100]}