diff --git a/src/views/administration/accessmanagement/EditApiKeyCommentModal.vue b/src/views/administration/accessmanagement/EditApiKeyCommentModal.vue
index ce1f450c2..37a49fa9c 100644
--- a/src/views/administration/accessmanagement/EditApiKeyCommentModal.vue
+++ b/src/views/administration/accessmanagement/EditApiKeyCommentModal.vue
@@ -43,7 +43,7 @@ export default {
   },
   data() {
     return {
-      comment: null,
+      comment: '',
     };
   },
   mounted() {
@@ -71,7 +71,7 @@ export default {
         });
     },
     resetValues: function () {
-      this.comment = null;
+      this.comment = '';
     },
   },
 };
diff --git a/src/views/administration/accessmanagement/Teams.vue b/src/views/administration/accessmanagement/Teams.vue
index a31a554fd..0e3f5078f 100644
--- a/src/views/administration/accessmanagement/Teams.vue
+++ b/src/views/administration/accessmanagement/Teams.vue
@@ -228,6 +228,7 @@ export default {
               apiKeysToDict: function (apiKeys) {
                 const dict = {};
                 apiKeys.forEach((item) => {
+                  item.comment = item.comment ? item.comment : '';
                   dict[item.publicId] = item;
                 });
                 return dict;
@@ -301,6 +302,7 @@ export default {
                     if (!this.apiKeys) {
                       this.apiKeys = {};
                     }
+                    response.data.comment = '';
                     this.$set(
                       this.apiKeys,
                       response.data.publicId,
@@ -324,6 +326,9 @@ export default {
                   .post(url)
                   .then((response) => {
                     this.$delete(this.apiKeys, apiKey.publicId);
+                    response.data.comment = response.data.comment
+                      ? response.data.comment
+                      : '';
                     this.$set(
                       this.apiKeys,
                       response.data.publicId,