app-Tygh-Shippings-Shippings.php.diff

diff --git a/app/Tygh/Shippings/Shippings.php b/app/Tygh/Shippings/Shippings.php
index 6679c67574..8dc3f50854 100644
--- a/app/Tygh/Shippings/Shippings.php
+++ b/app/Tygh/Shippings/Shippings.php
@@ -64,7 +64,7 @@ class Shippings
         fn_set_hook('shippings_group_products_list', $products, $groups);
 
         foreach ($groups as $key_group => $group) {
-            $groups[$key_group]['group_key'] = $group['company_id'];
+            $groups[$key_group]['group_key'] = !empty($group['group_key']) ? $group['group_key'] : $group['company_id'];
             $groups[$key_group]['package_info'] = self::_getPackageInfo($group);
             $groups[$key_group]['package_info_full'] = self::_getPackageInfo($group, true);
             unset($groups[$key_group]['origination']);