diff --git a/assets/layers/surveillance_camera/surveillance_camera.json b/assets/layers/surveillance_camera/surveillance_camera.json
index 97d4582b8..82728909e 100644
--- a/assets/layers/surveillance_camera/surveillance_camera.json
+++ b/assets/layers/surveillance_camera/surveillance_camera.json
@@ -26,7 +26,12 @@
   "source": {
     "osmTags": {
       "and": [
-        "man_made=surveillance",
+        {
+          "or": [
+            "man_made=surveillance",
+            "disused:man_made=surveillance"
+          ]
+        },
         {
           "or": [
             "surveillance:type=camera",
@@ -51,7 +56,15 @@
       "es": "Cámara de vigilancia",
       "cs": "Bezpečnostní kamera",
       "sl": "Nadzorna kamera"
-    }
+    },
+    "mappings": [
+      {
+        "if": "disused:man_made=surveillance",
+        "then": {
+          "en": "Disused surveillance camera"
+        }
+      }
+    ]
   },
   "pointRendering": [
     {
@@ -121,7 +134,13 @@
             "then": "calc({_direction:numerical}deg - 90deg)"
           }
         ]
-      }
+      },
+      "iconBadges": [
+        {
+          "if": "disused:man_made=surveillance",
+          "then": "close:red"
+        }
+      ]
     }
   ],
   "lineRendering": [
@@ -232,6 +251,35 @@
   ],
   "tagRenderings": [
     "images",
+    {
+      "id": "active",
+      "question": {
+        "en": "Is this camera currently in use?",
+        "nl": "Is deze camera momenteel in gebruik?"
+      },
+      "mappings": [
+        {
+          "if": "man_made=surveillance",
+          "then": {
+            "en": "This camera is currently in use.",
+            "nl": "Deze camera is momenteel in gebruik."
+          },
+          "addExtraTags": [
+            "disused:man_made="
+          ]
+        },
+        {
+          "if": "disused:man_made=surveillance",
+          "then": {
+            "en": "This camera is not used anymore",
+            "nl": "Deze camera is niet meer in gebruik"
+          },
+          "addExtraTags": [
+            "man_made="
+          ]
+        }
+      ]
+    },
     {
       "id": "has_alpr",
       "question": {
@@ -896,4 +944,4 @@
     "enableRelocation": false
   },
   "enableMorePrivacy": true
-}
+}
\ No newline at end of file