diff --git a/client/src/app/components/KeycloakProvider.tsx b/client/src/app/components/KeycloakProvider.tsx
index 363be14fe..4ba2211b6 100644
--- a/client/src/app/components/KeycloakProvider.tsx
+++ b/client/src/app/components/KeycloakProvider.tsx
@@ -3,6 +3,7 @@ import { ReactKeycloakProvider } from "@react-keycloak/web";
 import keycloak from "@app/keycloak";
 import { AppPlaceholder } from "./AppPlaceholder";
 import { initInterceptors } from "@app/axios-config";
+import ENV from "@app/env";
 
 interface IKeycloakProviderProps {
   children: React.ReactNode;
@@ -10,6 +11,16 @@ interface IKeycloakProviderProps {
 
 export const KeycloakProvider: React.FC<IKeycloakProviderProps> = ({
   children,
+}) => {
+  return ENV.AUTH_REQUIRED !== "true" ? (
+    <>{children}</>
+  ) : (
+    <AuthEnabledKeycloakProvider>{children}</AuthEnabledKeycloakProvider>
+  );
+};
+
+const AuthEnabledKeycloakProvider: React.FC<IKeycloakProviderProps> = ({
+  children,
 }) => {
   React.useEffect(() => {
     initInterceptors();