diff --git a/lib/NGCP/Panel/Role/API/CFDestinationSets.pm b/lib/NGCP/Panel/Role/API/CFDestinationSets.pm
index ffba53ef6d..d9a791db4f 100644
--- a/lib/NGCP/Panel/Role/API/CFDestinationSets.pm
+++ b/lib/NGCP/Panel/Role/API/CFDestinationSets.pm
@@ -148,7 +148,7 @@ sub update_item {
         if ($primary_nr_rs) {
             $number = $primary_nr_rs->cc . ($primary_nr_rs->ac //'') . $primary_nr_rs->sn;
         } else {
-            $number = ''
+            $number = $b_subscriber->uuid;
         }
         my $domain = $subscriber->domain->domain // '';
 
diff --git a/lib/NGCP/Panel/Role/API/CFMappings.pm b/lib/NGCP/Panel/Role/API/CFMappings.pm
index 2eab4f4d6b..01671be228 100644
--- a/lib/NGCP/Panel/Role/API/CFMappings.pm
+++ b/lib/NGCP/Panel/Role/API/CFMappings.pm
@@ -196,7 +196,7 @@ sub update_item {
                 if ($primary_nr_rs) {
                     $number = $primary_nr_rs->cc . ($primary_nr_rs->ac //'') . $primary_nr_rs->sn;
                 } else {
-                    $number = ''
+                    $number = $item->uuid;
                 }
                 my $domain = $item->provisioning_voip_subscriber->domain->domain // '';