diff --git a/resources/templates/provision/yealink/t40g/{$mac}.cfg b/resources/templates/provision/yealink/t40g/{$mac}.cfg
index fb74ef3d1c..bf34dffaaf 100644
--- a/resources/templates/provision/yealink/t40g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t40g/{$mac}.cfg
@@ -3022,28 +3022,17 @@ memorykey.{$row.device_key_id}.sub_type =
 #expansion_module.x.key.y.label =
 #expansion_module.X.key.Y.xml_phonebook =
 
-{$rownum = 1}
-
-{foreach $keys["expansion"] as $row}
-{if $rownum <= 40}
+{foreach $keys["expansion-1"] as $row}
 expansion_module.1.key.{$row.device_key_id}.type = {$row.device_key_type}
 expansion_module.1.key.{$row.device_key_id}.line = {$row.device_key_line}
 expansion_module.1.key.{$row.device_key_id}.value = {$row.device_key_value}
 expansion_module.1.key.{$row.device_key_id}.extension = {$row.device_key_extension}
 expansion_module.1.key.{$row.device_key_id}.label = {$row.device_key_label}
 expansion_module.1.key.{$row.device_key_id}.xml_phonebook =
-{else}
-expansion_module.2.key.{$row.device_key_id - 40}.type = {$row.device_key_type}
-expansion_module.2.key.{$row.device_key_id - 40}.line = {$row.device_key_line}
-expansion_module.2.key.{$row.device_key_id - 40}.value = {$row.device_key_value}
-expansion_module.2.key.{$row.device_key_id - 40}.extension = {$row.device_key_extension}
-expansion_module.2.key.{$row.device_key_id - 40}.label = {$row.device_key_label}
-expansion_module.2.key.{$row.device_key_id - 40}.xml_phonebook =
-{/if}
-{$rownum = $rownum + 1}
 
 {/foreach}
 
+
 ##########################################################################################
 ##                                  Expansion Module 2                                  ##
 ##########################################################################################
@@ -3057,3 +3046,13 @@ expansion_module.2.key.{$row.device_key_id - 40}.xml_phonebook =
 #expansion_module.2.key.1.xml_phonebook =
 #expansion_module.2.key.1.type =
 #expansion_module.2.key.1.label =
+
+{foreach $keys["expansion-2"] as $row}
+expansion_module.2.key.{$row.device_key_id}.type = {$row.device_key_type}
+expansion_module.2.key.{$row.device_key_id}.line = {$row.device_key_line}
+expansion_module.2.key.{$row.device_key_id}.value = {$row.device_key_value}
+expansion_module.2.key.{$row.device_key_id}.extension = {$row.device_key_extension}
+expansion_module.2.key.{$row.device_key_id}.label = {$row.device_key_label}
+expansion_module.2.key.{$row.device_key_id}.xml_phonebook =
+
+{/foreach}