diff --git a/packages/web/src/hooks/useActionSubsteps.js b/packages/web/src/hooks/useActionSubsteps.js
index 267c872a..7c4312d6 100644
--- a/packages/web/src/hooks/useActionSubsteps.js
+++ b/packages/web/src/hooks/useActionSubsteps.js
@@ -15,7 +15,7 @@ export default function useActionSubsteps({ appKey, actionKey }) {
 
       return data;
     },
-    enabled: !!appKey,
+    enabled: !!appKey && !!actionKey,
   });
 
   return query;
diff --git a/packages/web/src/hooks/useSamlAuthProvider.js b/packages/web/src/hooks/useSamlAuthProvider.js
index 509c73e4..74061204 100644
--- a/packages/web/src/hooks/useSamlAuthProvider.js
+++ b/packages/web/src/hooks/useSamlAuthProvider.js
@@ -2,7 +2,7 @@ import { useQuery } from '@tanstack/react-query';
 
 import api from 'helpers/api';
 
-export default function useSamlAuthProvider({ samlAuthProviderId }) {
+export default function useSamlAuthProvider({ samlAuthProviderId } = {}) {
   const query = useQuery({
     queryKey: ['samlAuthProvider', samlAuthProviderId],
     queryFn: async ({ signal }) => {
diff --git a/packages/web/src/hooks/useTriggerSubsteps.js b/packages/web/src/hooks/useTriggerSubsteps.js
index 6af75e01..c7f252b7 100644
--- a/packages/web/src/hooks/useTriggerSubsteps.js
+++ b/packages/web/src/hooks/useTriggerSubsteps.js
@@ -15,7 +15,7 @@ export default function useTriggerSubsteps({ appKey, triggerKey }) {
 
       return data;
     },
-    enabled: !!appKey,
+    enabled: !!appKey && !!triggerKey,
   });
 
   return query;
diff --git a/packages/web/src/pages/Authentication/index.jsx b/packages/web/src/pages/Authentication/index.jsx
index 83428a66..7b6e6826 100644
--- a/packages/web/src/pages/Authentication/index.jsx
+++ b/packages/web/src/pages/Authentication/index.jsx
@@ -11,7 +11,7 @@ function AuthenticationPage() {
   const formatMessage = useFormatMessage();
 
   const { data: adminSamlAuthProviders } = useAdminSamlAuthProviders();
-  const samlAuthProviderId = adminSamlAuthProviders?.data?.[0].id;
+  const samlAuthProviderId = adminSamlAuthProviders?.data?.[0]?.id;
 
   const { data, isLoading: isProviderLoading } = useSamlAuthProvider({
     samlAuthProviderId,