diff --git a/backend/src/main/java/org/davidbohl/dirigent/sercrets/SecretService.java b/backend/src/main/java/org/davidbohl/dirigent/sercrets/SecretService.java
index d0cf96d..cbed9f8 100644
--- a/backend/src/main/java/org/davidbohl/dirigent/sercrets/SecretService.java
+++ b/backend/src/main/java/org/davidbohl/dirigent/sercrets/SecretService.java
@@ -38,6 +38,9 @@ public class SecretService {
 
             Secret secret = secretRepository.findById(key).orElseGet(() -> new Secret(key, environmentVariable, value, deployments));
 
+            secret.setDeployments(deployments);
+            secret.setEnvironmentVariable(environmentVariable);
+
             if(value != null )
                 secret.setEncryptedValue(encrypt(value));
 
diff --git a/frontend/src/app/secrets/edit-secret-dialog/edit-secret-dialog.component.ts b/frontend/src/app/secrets/edit-secret-dialog/edit-secret-dialog.component.ts
index 5ac5967..76cb63f 100644
--- a/frontend/src/app/secrets/edit-secret-dialog/edit-secret-dialog.component.ts
+++ b/frontend/src/app/secrets/edit-secret-dialog/edit-secret-dialog.component.ts
@@ -70,6 +70,8 @@ export class EditSecretDialogComponent {
 
   addDeployment($event: MatChipInputEvent) {
 
+    if($event.value.trim().length === 0) return;
+
     $event.chipInput.clear();
 
     if (this.secret.deployments.includes($event.value)) return;