diff --git a/server/actions/dependencies/add/add-project-dependencies.ts b/server/actions/dependencies/add/add-project-dependencies.ts
index ff51d2c..450cb92 100644
--- a/server/actions/dependencies/add/add-project-dependencies.ts
+++ b/server/actions/dependencies/add/add-project-dependencies.ts
@@ -137,10 +137,12 @@ const getYarnPackageWithInfo = async (
   const type = getTypeFromPackageJson(projectPath, dependencyName);
   const required = getRequiredFromPackageJson(projectPath, dependencyName);
 
-  const info = installedInfo.find(
-    (x) => x.name.split('@')[0] === dependencyName,
-  );
-  const installed = info?.name.split('@')[1];
+  let atIndex = 0;
+  const info = installedInfo.find( (x) => {
+    atIndex = x.name.lastIndexOf('@');
+    return x.name.slice(0, atIndex) === dependencyName;
+  });
+  const installed = info?.name.slice(atIndex + 1);
 
   const wanted = getWantedVersion(
     installed,
diff --git a/server/actions/dependencies/get/get-project-dependencies.ts b/server/actions/dependencies/get/get-project-dependencies.ts
index 6930a4c..73271d0 100644
--- a/server/actions/dependencies/get/get-project-dependencies.ts
+++ b/server/actions/dependencies/get/get-project-dependencies.ts
@@ -183,10 +183,12 @@ const getAllYarnDependencies = async (
   );
 
   return allDependencies.map((dependency) => {
-    const info = installedInfo.find(
-      (x) => x.name.split('@')[0] === dependency.name,
-    );
-    const installed = info?.name.split('@')[1];
+    let atIndex = 0;
+    const info = installedInfo.find( (x) => {
+      atIndex = x.name.lastIndexOf('@');
+      return x.name.slice(0, atIndex) === dependency.name;
+    });
+    const installed = info?.name.slice(atIndex + 1);
 
     const wanted = getWantedVersion(
       installed,