diff --git a/apps/portal/src/components/offers/table/OffersTable.tsx b/apps/portal/src/components/offers/table/OffersTable.tsx
index 4ce1e0f9..93cc9c2f 100644
--- a/apps/portal/src/components/offers/table/OffersTable.tsx
+++ b/apps/portal/src/components/offers/table/OffersTable.tsx
@@ -159,7 +159,7 @@ export default function OffersTable({
   }
 
   const handlePageChange = (currPage: number) => {
-    if (0 < currPage && currPage < pagination.numOfPages) {
+    if (0 <= currPage && currPage < pagination.numOfPages) {
       setPagination({ ...pagination, currentPage: currPage });
     }
   };
diff --git a/apps/portal/src/pages/offers/index.tsx b/apps/portal/src/pages/offers/index.tsx
index b3f98ef9..87cdccf8 100644
--- a/apps/portal/src/pages/offers/index.tsx
+++ b/apps/portal/src/pages/offers/index.tsx
@@ -37,15 +37,21 @@ export default function OffersHomePage() {
             <JobTitlesTypeahead
               isLabelHidden={true}
               placeholder="Software Engineer"
-              // @ts-ignore TODO(offers): handle potentially null value.
-              onSelect={({ value }) => setjobTitleFilter(value)}
+              onSelect={(option) => {
+                if (option) {
+                  setjobTitleFilter(option.value);
+                }
+              }}
             />
             <span>in</span>
             <CompaniesTypeahead
               isLabelHidden={true}
               placeholder="All Companies"
-              // @ts-ignore TODO(offers): handle potentially null value.
-              onSelect={({ value }) => setCompanyFilter(value)}
+              onSelect={(option) => {
+                if (option) {
+                  setCompanyFilter(option.value);
+                }
+              }}
             />
           </div>
         </div>