diff --git a/cypress/composables/modals/credential-modal.ts b/cypress/composables/modals/credential-modal.ts
index 8ce6a86049..77b69fc586 100644
--- a/cypress/composables/modals/credential-modal.ts
+++ b/cypress/composables/modals/credential-modal.ts
@@ -35,7 +35,11 @@ export function setCredentialConnectionParameterInputByName(name: string, value:
 }
 
 export function saveCredential() {
-	getCredentialSaveButton().click({ force: true });
+	getCredentialSaveButton()
+		.click({ force: true })
+		.within(() => {
+			cy.get('button').should('not.exist');
+		});
 }
 
 export function closeCredentialModal() {