diff --git a/assets/layers/drinking_water/drinking_water.json b/assets/layers/drinking_water/drinking_water.json
index fc0e74030..8a609eeb8 100644
--- a/assets/layers/drinking_water/drinking_water.json
+++ b/assets/layers/drinking_water/drinking_water.json
@@ -160,9 +160,13 @@
       },
       "mappings": [
         {
-          "if": "operational_status=",
+          "if": {
+            "and": [
+              "operational_status=",
+              "disused:amenity="
+            ]
+          },
           "addExtraTags": [
-            "disused:amenity=",
             "amenity=drinking_water"
           ],
           "then": {
@@ -204,6 +208,15 @@
             "ca": "Aquesta font d'aigua potable està tancada",
             "cs": "Tato pitná voda je uzavřena"
           }
+        },
+        {
+          "if": "disused:amenity=drinking_water",
+          "addExtraTags": [
+            "amenity="
+          ],
+          "then": {
+            "en": "This drinking water is permanently closed"
+          }
         }
       ],
       "id": "Still in use?"