diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b669422..e08f4a99 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ TBD
 - Fix pipelines failing to build from gitlab pre-defined variable deprecation ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/582))
 - Fix incompatible buildx provenance meta, causing digest issues on GL/DH container registries ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/582))
 - Fix Auth'd servers in roles | Refine server ordering ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/574))
+- Fix import loop detection ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/575))
 ### Tweaks
 TBD
 ### Lang
diff --git a/app/classes/web/server_handler.py b/app/classes/web/server_handler.py
index 8b533bdf..e0921ce4 100644
--- a/app/classes/web/server_handler.py
+++ b/app/classes/web/server_handler.py
@@ -333,7 +333,7 @@ class ServerHandler(BaseHandler):
 
             if import_type == "import_jar":
                 if self.helper.is_subdir(
-                    import_server_path, self.controller.project_root
+                    self.controller.project_root, import_server_path
                 ):
                     self.redirect(
                         "/panel/error?error=Loop Error: The selected path will cause"
@@ -499,7 +499,7 @@ class ServerHandler(BaseHandler):
 
             if import_type == "import_jar":
                 if self.helper.is_subdir(
-                    import_server_path, self.controller.project_root
+                    self.controller.project_root, import_server_path
                 ):
                     self.redirect(
                         "/panel/error?error=Loop Error: The selected path will cause"