diff --git a/assets/layers/mobility_hub/mobility_hub.json b/assets/layers/mobility_hub/mobility_hub.json
index 085173bd8..d55ae9937 100644
--- a/assets/layers/mobility_hub/mobility_hub.json
+++ b/assets/layers/mobility_hub/mobility_hub.json
@@ -73,8 +73,20 @@
         "placeholder": {
           "en": "Name of the mobility hub",
           "nl": "Naam van de mobiliteitshub"
+        },
+        "addExtraTags": [
+          "noname="
+        ]
+      },
+      "mappings": [
+        {
+          "if": "noname=yes",
+          "then": {
+            "en": "This mobility hub does not have a name",
+            "nl": "Deze mobiliteitshub heeft geen naam"
+          }
         }
-      }
+      ]
     },
     {
       "question": {
@@ -90,7 +102,8 @@
           "nl": "Netwerk van deze mobiliteitshub"
         },
         "addExtraTags": [
-          "network:wikidata="
+          "network:wikidata=",
+          "nonetwork="
         ]
       },
       "render": {
@@ -98,6 +111,16 @@
         "nl": "Deze mobiliteitshub hoort bij het netwerk {network}"
       },
       "mappings": [
+        {
+          "if": "nonetwork=yes",
+          "then": {
+            "en": "This mobility hub does not belong to a network",
+            "nl": "Deze mobiliteitshub hoort niet bij een netwerk"
+          },
+          "addExtraTags": [
+            "network:wikidata="
+          ]
+        },
         {
           "if": "network=Groningen-Drenthe",
           "then": {
@@ -107,7 +130,8 @@
           "hideInAnswer": "_country!=nl",
           "icon": "./assets/layers/mobility_hub/hub-gd.svg",
           "addExtraTags": [
-            "network:wikidata=Q108742233"
+            "network:wikidata=Q108742233",
+            "nonetwork="
           ]
         },
         {
@@ -119,7 +143,8 @@
           "hideInAnswer": "_country!=be",
           "icon": "./assets/layers/mobility_hub/logo-hoppin.svg",
           "addExtraTags": [
-            "network:wikidata=Q124310711"
+            "network:wikidata=Q124310711",
+            "nonetwork="
           ]
         },
         {
@@ -130,7 +155,8 @@
           },
           "hideInAnswer": "_country!=de",
           "addExtraTags": [
-            "network:wikidata=Q110948933"
+            "network:wikidata=Q110948933",
+            "nonetwork="
           ]
         }
       ]