diff --git a/resources/templates/provision/yealink/t22/{$mac}.cfg b/resources/templates/provision/yealink/t22/{$mac}.cfg
index 56a9d6ff6f..cd1c26c51f 100644
--- a/resources/templates/provision/yealink/t22/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t22/{$mac}.cfg
@@ -1904,5 +1904,6 @@ linekey.{$row.device_key_id}.type = {$row.device_key_type}
 linekey.{$row.device_key_id}.xml_phonebook = 
 linekey.{$row.device_key_id}.label = {$row.device_key_label}
 
+{/if}
 {/foreach}
 
diff --git a/resources/templates/provision/yealink/t28/{$mac}.cfg b/resources/templates/provision/yealink/t28/{$mac}.cfg
index f10b7e2a81..6c230114ef 100644
--- a/resources/templates/provision/yealink/t28/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t28/{$mac}.cfg
@@ -1936,8 +1936,6 @@ memorykey.{$row.device_key_id}.label = {$row.device_key_label}
 memorykey.{$row.device_key_id}.xml_phonebook = 
 memorykey.{$row.device_key_id}.sub_type = 
 
-{else}
-memorykey.1.type =  NA
 {/if}
 {/foreach}
 
diff --git a/resources/templates/provision/yealink/t38g/{$mac}.cfg b/resources/templates/provision/yealink/t38g/{$mac}.cfg
index a9ecdf0005..6c230114ef 100644
--- a/resources/templates/provision/yealink/t38g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t38g/{$mac}.cfg
@@ -1904,6 +1904,7 @@ linekey.{$row.device_key_id}.type = {$row.device_key_type}
 linekey.{$row.device_key_id}.xml_phonebook = 
 linekey.{$row.device_key_id}.label = {$row.device_key_label}
 
+{/if}
 {/foreach}
 
 
diff --git a/resources/templates/provision/yealink/vp530/{$mac}.cfg b/resources/templates/provision/yealink/vp530/{$mac}.cfg
index 5b35eb48d2..8ab712e774 100644
--- a/resources/templates/provision/yealink/vp530/{$mac}.cfg
+++ b/resources/templates/provision/yealink/vp530/{$mac}.cfg
@@ -1403,6 +1403,7 @@ linekey.{$row.device_key_id}.type = {$row.device_key_type}
 linekey.{$row.device_key_id}.xml_phonebook = 
 linekey.{$row.device_key_id}.label = {$row.device_key_label}
 
+{/if}
 {/foreach}