diff --git a/code/gms-frontend/src/app/components/secret/secret-detail.component.html b/code/gms-frontend/src/app/components/secret/secret-detail.component.html
index 8e919c51..31352866 100644
--- a/code/gms-frontend/src/app/components/secret/secret-detail.component.html
+++ b/code/gms-frontend/src/app/components/secret/secret-detail.component.html
@@ -245,7 +245,7 @@
             value="{{ data.lastRotated | momentPipe:'yyyy.MM.DD. HH:mm:ss'}}">
         </mat-form-field>
         }
-        <button [disabled]="form.status ==='INVALID' || validationState !== 'VALID'" mat-button color="primary" (click)="save()">{{ 'buttons.save' |
+        <button [disabled]="form.status ==='INVALID' || (validationState !== 'VALID' && validationState !== 'UNDEFINED')" mat-button color="primary" (click)="save()">{{ 'buttons.save' |
           translate }}</button>
       </mat-card-content>
     </mat-card>
diff --git a/code/gms-frontend/src/app/components/secret/secret-detail.component.spec.ts b/code/gms-frontend/src/app/components/secret/secret-detail.component.spec.ts
index 9498716d..a0da8fa2 100644
--- a/code/gms-frontend/src/app/components/secret/secret-detail.component.spec.ts
+++ b/code/gms-frontend/src/app/components/secret/secret-detail.component.spec.ts
@@ -359,6 +359,7 @@ describe('SecretDetailComponent', () => {
         configureTestBed();
 
         // act
+        component.valueDisplayed = true;
         component.data = secretInput;
         component.validateSecretLength();
 
@@ -376,6 +377,7 @@ describe('SecretDetailComponent', () => {
         configureTestBed();
 
         // act
+        component.valueDisplayed = true;
         component.validateSecretLength();
 
         // assert
@@ -389,6 +391,7 @@ describe('SecretDetailComponent', () => {
         configureTestBed();
 
         // act
+        component.valueDisplayed = true;
         component.validateSecretLength();
 
         // assert
diff --git a/code/gms-frontend/src/app/components/secret/secret-detail.component.ts b/code/gms-frontend/src/app/components/secret/secret-detail.component.ts
index 2bb90895..5a3c1f73 100644
--- a/code/gms-frontend/src/app/components/secret/secret-detail.component.ts
+++ b/code/gms-frontend/src/app/components/secret/secret-detail.component.ts
@@ -68,7 +68,7 @@ export class SecretDetailComponent extends BaseDetailComponent<Secret, SecretSer
         allApiKeysAllowed: true
     };
 
-    // interval config
+    valueDisplayed = false;
     private keyPressTimeout: any;
     validationState: ValidationState = ValidationState.UNDEFINED;
 
@@ -105,6 +105,8 @@ export class SecretDetailComponent extends BaseDetailComponent<Secret, SecretSer
 
             this.refreshSelectableRoles();
         });
+        this.valueDisplayed = this.data.id === undefined;
+        this.validateSecretLength();
     }
 
     override dataLoadingCallback(data: Secret): void {
@@ -146,6 +148,7 @@ export class SecretDetailComponent extends BaseDetailComponent<Secret, SecretSer
     showValue() {
         this.service.getValue(this.data.id).subscribe(value => {
             this.data.value = value;
+            this.valueDisplayed = true;
 
             if (this.data.type !== 'MULTIPLE_CREDENTIAL') {
                 return;
@@ -153,6 +156,7 @@ export class SecretDetailComponent extends BaseDetailComponent<Secret, SecretSer
 
             this.multipleCredential = this.parseValue(this.data.value);
             this.refreshTable();
+            this.validateSecretLength();
         });
     }
 
@@ -246,7 +250,12 @@ export class SecretDetailComponent extends BaseDetailComponent<Secret, SecretSer
     }
 
     validateSecretLength() {
+        if (this.valueDisplayed === false) {
+            return;
+        }
+
         this.transformMultipleCredentials();
+
         if (this.data.value.length === 0 || this.data.keystoreId === undefined || this.data.keystoreAliasId === undefined) {
             this.validationState = ValidationState.INVALID_INPUT;
             return;