diff --git a/assets/layers/defibrillator/defibrillator.json b/assets/layers/defibrillator/defibrillator.json
index 66d0470c9c..36c9ba0816 100644
--- a/assets/layers/defibrillator/defibrillator.json
+++ b/assets/layers/defibrillator/defibrillator.json
@@ -385,13 +385,23 @@
         "nl": "{opening_hours_table(opening_hours)}"
       },
       "question": {
-        "en": "At what times is this defibrillator available? (use 24/7 to indicate it's always available)",
-        "nl": "Wanneer is deze defibrillator beschikbaar? (schrijf 24/7 om aan te geven dat hij steeds beschikbaar is)"
+        "en": "At what times is this defibrillator available?",
+        "nl": "Wanneer is deze defibrillator beschikbaar?"
       },
       "freeform": {
         "key": "opening_hours",
         "type": "opening_hours"
-      }
+      },
+      "mappings": [
+            {
+              "if": "opening_hours=24/7",
+              "then": 
+              {
+                "en": "24/7 opened (including holidays)",
+                "nl": "24/7 open (inclusief feestdagen)"
+              }
+            }
+          ]
     },
     {
       "render": {
@@ -445,4 +455,4 @@
       }
     }
   ]
-}
\ No newline at end of file
+}