diff --git a/users/edit-kyc.php b/users/edit-kyc.php
index ac942b7..3708a90 100644
--- a/users/edit-kyc.php
+++ b/users/edit-kyc.php
@@ -37,8 +37,11 @@ $BearerToken = $_SESSION['token'];
             $response = get_kyc_info($IDkyc, $BearerToken);
             $array = json_decode($response, true);
 
-            $CurrentUserAddress = '' . $array['userRef']['address1'] . ', ' . $array['userRef']['city'] . ', ' . $array['userRef']['province'] . ', ' . $array['userRef']['country'] . ' ' . $array['userRef']['zip'];
-
+            if (!empty($array['userRef']['address1'] && $array['userRef']['city'] && $array['userRef']['province'] && $array['userRef']['zip'] || $array['userRef']['country'])) {
+                $CurrentUserAddress = '' . $array['userRef']['address1'] . ', ' . $array['userRef']['city'] . ', ' . $array['userRef']['province'] . ', ' . $array['userRef']['country'] . ' ' . $array['userRef']['zip'];
+            } else {
+                $CurrentUserAddress = "";
+            }
             // Check if the decoding was successful
             if ($array !== null) {
             ?>