diff --git a/package.json b/package.json
index 8ccc02f20..3576a1909 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "final-form-arrays": "^3.0.2",
     "fs-extra": "^10.0.0",
     "identity-obj-proxy": "^3.0.0",
-    "iguazio.dashboard-react-controls": "1.8.4",
+    "iguazio.dashboard-react-controls": "1.8.5",
     "is-wsl": "^1.1.0",
     "js-base64": "^2.5.2",
     "js-yaml": "^3.13.1",
diff --git a/src/common/TargetPath/targetPath.util.js b/src/common/TargetPath/targetPath.util.js
index 5bf49c2d7..686d14161 100644
--- a/src/common/TargetPath/targetPath.util.js
+++ b/src/common/TargetPath/targetPath.util.js
@@ -304,9 +304,9 @@ export const generateArtifactsReferencesList = artifacts => {
       const [nextRefIter, nextRefTree] = nextRef.id.split('@')
 
       if (prevRefTree === nextRefTree) {
-        return prevRefIter.localeCompare(nextRefIter)
+        return prevRefIter && prevRefIter.localeCompare(nextRefIter)
       } else {
-        return prevRefTree.localeCompare(nextRefTree)
+        return prevRefTree && prevRefTree.localeCompare(nextRefTree)
       }
     })