diff --git a/package.json b/package.json
index b11e8ca9..dcf1014c 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     "@vitejs/plugin-vue-jsx": "^3.1.0",
     "@vue/compiler-sfc": "^3.4.23",
     "@vueuse/components": "^10.9.0",
-    "@weni/unnnic-system": "2.0.6",
+    "@weni/unnnic-system": "2.0.13",
     "axios": "^1.6.7",
     "core-js": "^3.36.0",
     "global": "^4.4.0",
diff --git a/src/components/config/channels/WWC/Config.vue b/src/components/config/channels/WWC/Config.vue
index 774d9a73..894fb1d9 100644
--- a/src/components/config/channels/WWC/Config.vue
+++ b/src/components/config/channels/WWC/Config.vue
@@ -914,13 +914,17 @@
         &__buttons {
           margin-top: $unnnic-spacing-stack-sm;
           display: flex;
-          width: 95%;
+          width: 100%;
           gap: $unnnic-spacing-inline-xs;
           justify-content: center;
 
+          :deep(.unnnic-button){
+            width: 250px;
+          }
+
           &__cancel &__save {
+            display: flex;
             flex-grow: 1;
-            width: 250px;
             margin: $unnnic-spacing-inline-xs;
           }
         }
diff --git a/src/components/whatsAppTemplates/FormTabContent.vue b/src/components/whatsAppTemplates/FormTabContent.vue
index 5a60339f..941a2061 100644
--- a/src/components/whatsAppTemplates/FormTabContent.vue
+++ b/src/components/whatsAppTemplates/FormTabContent.vue
@@ -40,6 +40,7 @@
           :options="availableLanguages"
           :modelValue="templateLanguage"
           @update:modelValue="handleLanguageSelection"
+          :selectFirst="false"
           multiple
         />
       </div>
@@ -278,7 +279,7 @@
         this.$refs.categorySelect.active = false;
       },
       handleLanguageSelection(value) {
-        if (value.length === 0) {
+        if (!value || value.length === 0) {
           this.setTemplateTranslationCurrentForm = 'New Language';
           this.updateTemplateTranslationForm({
             formName: this.selectedForm,
diff --git a/yarn.lock b/yarn.lock
index 15c8b151..5f112017 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2180,10 +2180,10 @@
   dependencies:
     vue-demi ">=0.14.7"
 
-"@weni/unnnic-system@2.0.6":
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/@weni/unnnic-system/-/unnnic-system-2.0.6.tgz#b648899bc9ac1187d1ab607f51ef5b1a1720d87b"
-  integrity sha512-eFVQWM/Rm9h8w7UHGGk+q4P4iQ+tbABKtUjwdDhqvSPcic9qo/CZz014Q2/XhTWbc2MO39/kYS5OLSv5YXviHg==
+"@weni/unnnic-system@2.0.13":
+  version "2.0.13"
+  resolved "https://registry.yarnpkg.com/@weni/unnnic-system/-/unnnic-system-2.0.13.tgz#81f35714512c23f33ef30c05f994cdbd01e7423c"
+  integrity sha512-ZQnI7AOmdKdm6R6pC20BEntI4xOu7t5chXDogBfE98tNPZnXUaUVCzl3qkQYoeQG2KZDR3zdUr4IKaxoay0Yhg==
   dependencies:
     "@emoji-mart/data" "^1.1.2"
     "@vueuse/components" "^10.4.1"