diff --git a/packages/webapp/src/containers/AddFarm/saga.js b/packages/webapp/src/containers/AddFarm/saga.js
index f7a91f3837..2ef2efc8db 100644
--- a/packages/webapp/src/containers/AddFarm/saga.js
+++ b/packages/webapp/src/containers/AddFarm/saga.js
@@ -29,8 +29,7 @@ import { axios, getHeader } from '../saga';
 import { createAction } from '@reduxjs/toolkit';
 import i18n from '../../locales/i18n';
 import { enqueueErrorSnackbar } from '../Snackbar/snackbarSlice';
-import { invalidateTags } from '../../store/api/apiSlice';
-import { FarmLibraryTags, FarmTags } from '../../store/api/apiTags';
+import { resetApiState } from '../../store/api/apiSlice';
 
 const patchRoleUrl = (farm_id, user_id) => `${userFarmUrl}/role/farm/${farm_id}/user/${user_id}`;
 const patchFarmUrl = (farm_id) => `${farmUrl}/owner_operated/${farm_id}`;
@@ -62,7 +61,7 @@ export function* postFarmSaga({ payload: { showFarmNameCharacterLimitExceededErr
     yield call(axios.patch, patchStepUrl(farm_id, user_id), step, getHeader(user_id, farm_id));
 
     // Clear old farm RTK Query data
-    yield put(invalidateTags([...FarmTags, ...FarmLibraryTags]));
+    yield put(resetApiState());
 
     const user = getUserResult?.data;
     yield put(
diff --git a/packages/webapp/src/containers/saga.js b/packages/webapp/src/containers/saga.js
index 3e49cdd967..9d37e3d8dc 100644
--- a/packages/webapp/src/containers/saga.js
+++ b/packages/webapp/src/containers/saga.js
@@ -151,8 +151,7 @@ import {
   onLoadingWatercourseFail,
   onLoadingWatercourseStart,
 } from './watercourseSlice';
-import { api, invalidateTags } from '../store/api/apiSlice';
-import { FarmLibraryTags, FarmTags } from '../store/api/apiTags';
+import { api, resetApiState } from '../store/api/apiSlice';
 import {
   getSoilSampleLocationsSuccess,
   onLoadingSoilSampleLocationFail,
@@ -658,7 +657,7 @@ export function* fetchAllSaga() {
 export function* clearOldFarmStateSaga() {
   yield put(resetTasks());
   yield put(resetDateRange());
-  yield put(invalidateTags([...FarmTags, ...FarmLibraryTags]));
+  yield put(resetApiState());
 
   // Reset finance loading state
   yield put(setIsFetchingData(true));
diff --git a/packages/webapp/src/store/api/apiSlice.ts b/packages/webapp/src/store/api/apiSlice.ts
index 61b39fc107..24d28f0f0f 100644
--- a/packages/webapp/src/store/api/apiSlice.ts
+++ b/packages/webapp/src/store/api/apiSlice.ts
@@ -78,6 +78,8 @@ import { API_TAGS, ApiTag } from './apiTags';
  */
 export const invalidateTags = (tags: ApiTag[]) => api.util.invalidateTags(tags);
 
+export const resetApiState = () => api.util.resetApiState();
+
 const NON_JSON_ENDPOINT_KEYS = new Set(['addSupportTicket']);
 
 export const api = createApi({