diff --git a/client/src/components/Tool/ToolForm.vue b/client/src/components/Tool/ToolForm.vue
index 18c068ebb92..db8d313c7a3 100644
--- a/client/src/components/Tool/ToolForm.vue
+++ b/client/src/components/Tool/ToolForm.vue
@@ -276,10 +276,11 @@ export default {
         },
         hasCredentialsErrors() {
             if (this.formConfig.credentials?.length) {
-                const { hasUserProvidedAllRequiredServiceCredentials } = useUserToolCredentials(
-                    this.formConfig.id,
-                    this.formConfig.version,
-                );
+                const { hasUserProvidedAllRequiredServiceCredentials, toolHasRequiredServiceCredentials } =
+                    useUserToolCredentials(this.formConfig.id, this.formConfig.version);
+                if (!toolHasRequiredServiceCredentials.value) {
+                    return false;
+                }
                 return !hasUserProvidedAllRequiredServiceCredentials.value;
             }
             return false;