diff --git a/modules/Migration/schema/720_to_721.php b/modules/Migration/schema/720_to_721.php
index 0de7e29f1f5c879621dacf980504ffccf58a5c73..e466f569adc1aa050b0203ae48038e5796969a00 100644
--- a/modules/Migration/schema/720_to_721.php
+++ b/modules/Migration/schema/720_to_721.php
@@ -260,14 +260,13 @@ if (defined('VTIGER_UPGRADE')) {
     $block->addField($field);
     
     //Adding related list between Emails and Potentials
-    $potentialsModule = Vtiger_Module_Model::getInstance('Potentials');
-    if($potentialsModule){
-        $potentialsModule->setRelatedList(Vtiger_Module_Model::getInstance('Emails'), 'Emails', 'ADD', 'get_emails');
+    $emailRelatedModules = array('Potentials', 'HelpDesk');
+    foreach ($emailRelatedModules as $key => $moduleName) {
+        $moduleModel = Vtiger_Module_Model::getInstance($moduleName);
+        if($moduleModel){
+            $moduleModel->setRelatedList(Vtiger_Module_Model::getInstance('Emails'), 'Emails', 'ADD', 'get_emails');
 
-    }   
-    $helpDeskModule = Vtiger_Module_Model::getInstance('HelpDesk');
-    if($helpDeskModule){
-            $helpDeskModule->setRelatedList(Vtiger_Module_Model::getInstance('Emails'), 'Emails', 'ADD', 'get_emails');
+        }   
     }
     print('Email related list added for Tickets and Opportunities module');
 }
\ No newline at end of file