diff --git a/sdk/ml/azure-ai-ml/azure/ai/ml/_utils/_artifact_utils.py b/sdk/ml/azure-ai-ml/azure/ai/ml/_utils/_artifact_utils.py
index 9b00040ef19c..970eb3e62e68 100644
--- a/sdk/ml/azure-ai-ml/azure/ai/ml/_utils/_artifact_utils.py
+++ b/sdk/ml/azure-ai-ml/azure/ai/ml/_utils/_artifact_utils.py
@@ -171,12 +171,12 @@ def _redirect_artifacts_tool_path(self, organization: Optional[str]):
         if not organization:
             organization, _ = self.get_organization_project_by_git()
 
-        organization_pattern = r"https:\/\/(.*)\.visualstudio\.com"
+        organization_pattern = r"https:\/\/([^/]+)\.visualstudio\.com"
         result = re.findall(pattern=organization_pattern, string=organization)
         if result:
             organization_name = result[0]
         else:
-            organization_pattern = r"https:\/\/dev\.azure\.com\/(.*)"
+            organization_pattern = r"https:\/\/dev\.azure\.com\/([^/]+)"
             result = re.findall(pattern=organization_pattern, string=organization)
             if not result:
                 raise RuntimeError("Cannot find artifact organization.")