diff --git a/package.json b/package.json
index 9dbe39eda..022e81280 100644
--- a/package.json
+++ b/package.json
@@ -47,8 +47,6 @@
         "server-train-manager": "npm run dev --workspace=packages/server-train-manager"
     },
     "lint-staged": {
-        "*.vue": "npm run lint:fix",
-        "*.js": "npm run lint:fix",
-        "*.ts": "npm run lint:fix"
+        "*.{vue,js,ts}": "npm run lint:fix"
     }
 }
diff --git a/packages/client-ui/nuxt.config.ts b/packages/client-ui/nuxt.config.ts
index a57b677d7..a9620a7af 100644
--- a/packages/client-ui/nuxt.config.ts
+++ b/packages/client-ui/nuxt.config.ts
@@ -13,6 +13,9 @@ export default defineNuxtConfig({
     experimental: {
         scanPageMeta: false,
     },
+    devtools: {
+        componentInspector: false,
+    },
     runtimeConfig: {
         authupUrl: process.env.AUTHUP_URL,
         coreUrl: process.env.CORE_URL,
diff --git a/packages/client-vue/src/components/node/FNodeForm.ts b/packages/client-vue/src/components/node/FNodeForm.ts
index 7af0c496f..253529a32 100644
--- a/packages/client-vue/src/components/node/FNodeForm.ts
+++ b/packages/client-vue/src/components/node/FNodeForm.ts
@@ -77,7 +77,7 @@ export default defineComponent({
                 required,
             },
             registry_id: {
-                required,
+
             },
             external_name: {
                 alphaNumHyphenUnderscore: helpers.regex(alphaNumHyphenUnderscoreRegex),
diff --git a/packages/server-core/src/domains/analysis/commands/build-start.ts b/packages/server-core/src/domains/analysis/commands/build-start.ts
index 6975c3bc8..e4ea7eaf8 100644
--- a/packages/server-core/src/domains/analysis/commands/build-start.ts
+++ b/packages/server-core/src/domains/analysis/commands/build-start.ts
@@ -32,16 +32,24 @@ export async function startAnalysisBuild(
     }
 
     const analysisNodeRepository = dataSource.getRepository(AnalysisNodeEntity);
-    const trainStations = await analysisNodeRepository.find({
+    const analysisNodes = await analysisNodeRepository.find({
         where: {
             analysis_id: entity.id,
         },
+        relations: ['node'],
     });
 
-    for (let i = 0; i < trainStations.length; i++) {
-        if (trainStations[i].approval_status !== AnalysisNodeApprovalStatus.APPROVED) {
+    for (let i = 0; i < analysisNodes.length; i++) {
+        if (analysisNodes[i].approval_status !== AnalysisNodeApprovalStatus.APPROVED) {
             throw new BadRequestError('Not all nodes have approved the analysis yet.');
         }
+
+        if (
+            analysisNodes[i].node &&
+            !analysisNodes[i].node.registry_id
+        ) {
+            throw new BadRequestError(`The node ${analysisNodes[i].node.name} is not assigned to a registry yet.`);
+        }
     }
 
     if (!entity.registry_id) {
diff --git a/packages/server-core/src/domains/node/entity.ts b/packages/server-core/src/domains/node/entity.ts
index e1b6d90d1..6f9d55f91 100644
--- a/packages/server-core/src/domains/node/entity.ts
+++ b/packages/server-core/src/domains/node/entity.ts
@@ -6,7 +6,6 @@
  */
 
 import {
-    BeforeInsert, BeforeUpdate,
     Column,
     CreateDateColumn,
     Entity,
@@ -86,14 +85,4 @@ export class NodeEntity implements Node {
 
     @UpdateDateColumn()
         updated_at: Date;
-
-    // ------------------------------------------------------------------
-
-    @BeforeInsert()
-    @BeforeUpdate()
-    setHidden() {
-        if (!this.registry_id) {
-            this.hidden = true;
-        }
-    }
 }