diff --git a/Modules/Microsoft365DSC/Modules/M365DSCUtil.psm1 b/Modules/Microsoft365DSC/Modules/M365DSCUtil.psm1
index bc9d1bd325..f9d9cbe995 100644
--- a/Modules/Microsoft365DSC/Modules/M365DSCUtil.psm1
+++ b/Modules/Microsoft365DSC/Modules/M365DSCUtil.psm1
@@ -3368,10 +3368,14 @@ function Get-M365DSCExportContentForResource
             $ConnectionMode -eq 'ManagedIdentity')
     {
         $OrganizationName = $Results.TenantId
+    }    
+    elseif ($null -ne $Credential.UserName)
+    {
+        $OrganizationName = $Credential.UserName.Split('@')[1]
     }
     else
     {
-        $OrganizationName = $Credential.UserName.Split('@')[1]
+        $OrganizationName = ''
     }
 
     # Ensure the string properties are properly formatted;