diff --git a/server/api/secret.go b/server/api/secret.go
index 4ff3a9980..bc4b32831 100644
--- a/server/api/secret.go
+++ b/server/api/secret.go
@@ -88,10 +88,10 @@ func PatchSecret(c *gin.Context) {
 	if in.Value != "" {
 		secret.Value = in.Value
 	}
-	if len(in.Events) != 0 {
+	if in.Events != nil {
 		secret.Events = in.Events
 	}
-	if len(in.Images) != 0 {
+	if in.Images != nil {
 		secret.Images = in.Images
 	}
 
diff --git a/web/src/components/repo/settings/SecretsTab.vue b/web/src/components/repo/settings/SecretsTab.vue
index 6c7301715..a749d109e 100644
--- a/web/src/components/repo/settings/SecretsTab.vue
+++ b/web/src/components/repo/settings/SecretsTab.vue
@@ -133,7 +133,10 @@ export default defineComponent({
       },
       set(value) {
         if (selectedSecret.value) {
-          selectedSecret.value.image = value.split(',').map((s) => s.trim());
+          selectedSecret.value.image = value
+            .split(',')
+            .map((s) => s.trim())
+            .filter((s) => s !== '');
         }
       },
     });