diff --git a/backend/data_wizard/views.py b/backend/data_wizard/views.py
index 2ebd592ce4..071ed6e4be 100644
--- a/backend/data_wizard/views.py
+++ b/backend/data_wizard/views.py
@@ -2572,8 +2572,16 @@ def _process_compliance_assessment(
         results = {"successful": 0, "failed": 0, "errors": []}
         try:
             # Get the perimeter object to extract its folder ID
-            perimeter = Perimeter.objects.get(id=perimeter_id)
-            folder_id = perimeter.folder.id
+            perimeter = None
+            if perimeter_id is not None:
+                perimeter = Perimeter.objects.get(id=perimeter_id)
+
+            if perimeter is not None:
+                folder_id = perimeter.folder.id
+            elif folder_id is None:
+                raise AssertionError(
+                    "A folder must be specified when there's no perimeter!"
+                )
 
             timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
             assessment_name = f"Assessment_{timestamp}"
@@ -3654,8 +3662,18 @@ def _process_risk_assessment(
 
         try:
             # Get the perimeter and its domain
-            perimeter = Perimeter.objects.get(id=perimeter_id)
-            domain = perimeter.folder
+            perimeter = None
+            if perimeter_id is not None:
+                perimeter = Perimeter.objects.get(id=perimeter_id)
+
+            if perimeter is not None:
+                domain = perimeter.folder
+            else:
+                if folder_id is None:
+                    raise AssertionError(
+                        "A folder must be specified when there's no perimeter!"
+                    )
+                domain = Folder.objects.get(id=folder_id)
 
             # Get the risk matrix
             risk_matrix = RiskMatrix.objects.get(id=matrix_id)
diff --git a/cli/clica.py b/cli/clica.py
index 13b4cc6420..a0e4a4e357 100755
--- a/cli/clica.py
+++ b/cli/clica.py
@@ -325,7 +325,7 @@ def upload_data_wizard_file(
         "model_type": "ComplianceAssessment",
         "help": "Import compliance assessments using the Data Wizard backend.",
         "requires_folder": False,
-        "requires_perimeter": True,
+        "requires_perimeter": False,
         "requires_framework": True,
         "requires_matrix": False,
     },
@@ -343,7 +343,7 @@ def upload_data_wizard_file(
         "model_type": "RiskAssessment",
         "help": "Import risk assessments using the Data Wizard backend.",
         "requires_folder": False,
-        "requires_perimeter": True,
+        "requires_perimeter": False,
         "requires_framework": False,
         "requires_matrix": True,
     },