diff --git a/src/api/apiPatchUserData.ts b/src/api/apiPatchUserData.ts
index 392823870..65d02d7e5 100644
--- a/src/api/apiPatchUserData.ts
+++ b/src/api/apiPatchUserData.ts
@@ -11,7 +11,8 @@ export const apiPatchUserData = async (data): Promise<any> => {
 		rcValidation: true,
 		responseHandling: [
 			FETCH_ERRORS.BAD_REQUEST,
-			FETCH_ERRORS.FAILED_DEPENDENCY
+			FETCH_ERRORS.FAILED_DEPENDENCY,
+			FETCH_ERRORS.GATEWAY_TIMEOUT
 		]
 	});
 };
diff --git a/src/api/fetchData.ts b/src/api/fetchData.ts
index 3887eb499..a2773815e 100644
--- a/src/api/fetchData.ts
+++ b/src/api/fetchData.ts
@@ -30,6 +30,7 @@ export const FETCH_ERRORS = {
 	EMPTY: 'EMPTY',
 	FAILED_DEPENDENCY: 'FAILED_DEPENDENCY',
 	FORBIDDEN: 'FORBIDDEN',
+	GATEWAY_TIMEOUT: 'GATEWAY_TIMEOUT',
 	NO_MATCH: 'NO_MATCH',
 	TIMEOUT: 'TIMEOUT',
 	UNAUTHORIZED: 'UNAUTHORIZED',
@@ -216,6 +217,11 @@ export const fetchData = ({
 						responseHandling.includes(FETCH_ERRORS.ABORTED)
 					) {
 						reject(new Error(FETCH_ERRORS.ABORTED));
+					} else if (
+						response.status === 504 &&
+						responseHandling.includes(FETCH_ERRORS.GATEWAY_TIMEOUT)
+					) {
+						reject(new Error(FETCH_ERRORS.GATEWAY_TIMEOUT));
 					} else if (response.status === 401) {
 						logout(true, appConfig.urls.toLogin);
 					}