diff --git a/src/main/java/com/checkmarx/jenkins/CxScanBuilder.java b/src/main/java/com/checkmarx/jenkins/CxScanBuilder.java
index f410d474..3b5ff4f6 100644
--- a/src/main/java/com/checkmarx/jenkins/CxScanBuilder.java
+++ b/src/main/java/com/checkmarx/jenkins/CxScanBuilder.java
@@ -1250,8 +1250,12 @@ private CxScanConfig resolveConfiguration(Run<?, ?> run, DescriptorImpl descript
             }
         }
         
-        //Jenkins UI does not send teamName but team Id
-        teamPath = getTeamNameFromId(cxCredentials,descriptor, groupId);
+        // if teamPath not provided, get it as Jenkins UI does not send teamName but team Id
+        if (StringUtils.isEmpty(teamPath) && !StringUtils.isEmpty(groupId)) {
+            teamPath = getTeamNameFromId(cxCredentials,descriptor, groupId);
+        } else {
+            log.warn("Unable to get set Team Path, groupId or teamPath is required !");
+        }
 
         //project
         ret.setProjectName(env.expand(projectName.trim()));