diff --git a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
index 9006320513..5dd58dabd5 100644
--- a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
@@ -534,6 +534,9 @@ export default {
     if (!this.currentScenario.apiScenarioModuleId) {
       this.currentScenario.apiScenarioModuleId = "";
     }
+    if (this.currentScenario.apiScenarioModuleId === 'default-module') {
+      this.currentScenario.apiScenarioModuleId = this.moduleOptions[0].id;
+    }
     this.debug = false;
     this.debugLoading = false;
     if (this.stepFilter) {
diff --git a/frontend/src/business/components/api/definition/components/basis/AddBasisApi.vue b/frontend/src/business/components/api/definition/components/basis/AddBasisApi.vue
index 14791020af..57585fd94a 100644
--- a/frontend/src/business/components/api/definition/components/basis/AddBasisApi.vue
+++ b/frontend/src/business/components/api/definition/components/basis/AddBasisApi.vue
@@ -172,7 +172,7 @@
           this.httpForm.request.method = this.httpForm.method;
           this.httpForm.request.path = this.httpForm.path;
         }
-        if (this.currentModule != null) {
+        if (this.currentModule != null && this.currentModule.id) {
           this.httpForm.modulePath = this.currentModule.method != undefined ? this.currentModule.method : null;
           this.httpForm.moduleId = this.currentModule.id;
         } else {
diff --git a/frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue b/frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue
index 862d29f571..c8b2a04d86 100644
--- a/frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue
+++ b/frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue
@@ -698,6 +698,9 @@ export default {
     if (!this.basisData.environmentId) {
       this.basisData.environmentId = "";
     }
+    if (this.basisData.moduleId && this.basisData.moduleId === 'default-module') {
+      this.basisData.moduleId = this.moduleOptions[0].id;
+    }
     this.httpForm = JSON.parse(JSON.stringify(this.basisData));
     this.$get('/api/definition/follow/' + this.basisData.id, response => {
       this.httpForm.follows = response.data;