diff --git a/go.mod b/go.mod
index 558f7e32a..8ed9ccd71 100644
--- a/go.mod
+++ b/go.mod
@@ -14,7 +14,7 @@ require (
 	github.com/jedib0t/go-pretty/v6 v6.4.7
 	github.com/jfrog/build-info-go v1.9.10
 	github.com/jfrog/gofrog v1.3.0
-	github.com/jfrog/jfrog-client-go v1.32.0
+	github.com/jfrog/jfrog-client-go v1.32.1
 	github.com/magiconair/properties v1.8.7
 	github.com/manifoldco/promptui v0.9.0
 	github.com/owenrumney/go-sarif/v2 v2.2.0
diff --git a/go.sum b/go.sum
index ee7119ce9..c0825b56f 100644
--- a/go.sum
+++ b/go.sum
@@ -198,8 +198,8 @@ github.com/jfrog/build-info-go v1.9.10 h1:uXnDLVxpqxoAMpXcki00QaBB+M2BoGMMpHODPk
 github.com/jfrog/build-info-go v1.9.10/go.mod h1:ujJ8XQZMdT2tMkLSMJNyDd1pCY+duwHdjV+9or9FLIg=
 github.com/jfrog/gofrog v1.3.0 h1:o4zgsBZE4QyDbz2M7D4K6fXPTBJht+8lE87mS9bw7Gk=
 github.com/jfrog/gofrog v1.3.0/go.mod h1:IFMc+V/yf7rA5WZ74CSbXe+Lgf0iApEQLxRZVzKRUR0=
-github.com/jfrog/jfrog-client-go v1.32.0 h1:y2ABf24n7S/wYWEdrLk4wLl95uy2VjpdqUoJisR6ZtE=
-github.com/jfrog/jfrog-client-go v1.32.0/go.mod h1:362+oa7uTTYurzBs1L0dmUTlLo7uhpAU/pwM5Zb9clg=
+github.com/jfrog/jfrog-client-go v1.32.1 h1:RQmuPSLsF5222vZJzwkgHSZMMJF83ExS7SwIvh4P+H8=
+github.com/jfrog/jfrog-client-go v1.32.1/go.mod h1:362+oa7uTTYurzBs1L0dmUTlLo7uhpAU/pwM5Zb9clg=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=
diff --git a/xray/scangraph/scangraph.go b/xray/scangraph/scangraph.go
index e64cee74f..22dc755f0 100644
--- a/xray/scangraph/scangraph.go
+++ b/xray/scangraph/scangraph.go
@@ -25,8 +25,10 @@ func RunScanGraphAndGetResults(params *ScanGraphParams) (*services.ScanResponse,
 		params.xrayGraphScanParams.ScanType = ""
 	}
 
-	if params.xrayGraphScanParams.XscVersion, err = xrayManager.XscEnabled(); err != nil {
-		return nil, err
+	if params.xrayGraphScanParams.XscGitInfoContext != nil {
+		if params.xrayGraphScanParams.XscVersion, err = xrayManager.XscEnabled(); err != nil {
+			return nil, err
+		}
 	}
 
 	scanId, err := xrayManager.ScanGraph(*params.xrayGraphScanParams)