diff --git a/src/main/java/com/checkmarx/ast/wrapper/CxConfig.java b/src/main/java/com/checkmarx/ast/wrapper/CxConfig.java
index 9f65ba52..7c0189ca 100644
--- a/src/main/java/com/checkmarx/ast/wrapper/CxConfig.java
+++ b/src/main/java/com/checkmarx/ast/wrapper/CxConfig.java
@@ -48,8 +48,10 @@ List<String> toArguments() {
             commands.add(getTenant());
         }
 
-        commands.add(CxConstants.BASE_URI);
-        commands.add(getBaseUri());
+        if (StringUtils.isNotBlank(getBaseUri())) {
+            commands.add(CxConstants.BASE_URI);
+            commands.add(getBaseUri());
+        }
 
         if (StringUtils.isNotBlank(getBaseAuthUri())) {
             commands.add(CxConstants.BASE_AUTH_URI);