diff --git a/frontend/src/components/EndpointList/Filters.tsx b/frontend/src/components/EndpointList/Filters.tsx
index 27681e3a..047916f7 100644
--- a/frontend/src/components/EndpointList/Filters.tsx
+++ b/frontend/src/components/EndpointList/Filters.tsx
@@ -126,7 +126,9 @@ const EndpointFilters: React.FC<EndpointFilterProps> = React.memo(
           </Box>
         </Stack>
         <InputGroup>
-          <InputLeftElement pointerEvents="none" children={<GoSearch />} />
+          <InputLeftElement pointerEvents="none">
+            <GoSearch />
+          </InputLeftElement>
           <Input
             onChange={e => setSearchQuery(e.target.value)}
             w={{ base: "full", lg: "xs" }}
diff --git a/frontend/src/components/EndpointList/index.tsx b/frontend/src/components/EndpointList/index.tsx
index 1216b0a9..6aaf2c89 100644
--- a/frontend/src/components/EndpointList/index.tsx
+++ b/frontend/src/components/EndpointList/index.tsx
@@ -44,7 +44,7 @@ const EndpointList: React.FC<EndpointListProps> = React.memo(
           <List
             endpoints={endpoints}
             totalCount={totalCount}
-            currentPage={1}
+            currentPage={params.offset / ENDPOINT_PAGE_LIMIT + 1}
             setCurrentPage={setCurrentPage}
             fetching={fetching}
             setOrdering={(e: "ASC" | "DESC") => {}}