diff --git a/src/Main.hs b/src/Main.hs
index c5787dbae436012e01b9601cb20f5404d2a0dcdc..4de1183e811de90be3d1a445d8a3f76cdcc0a8a3 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -123,12 +123,11 @@ checkProperty layer prop = do
             urlValue <- lift $ getAttr prop "value"
             info $ "found jitsi room: " <> showAeson urlValue
             suggestPropertyValue "jitsiTrigger" "onaction"
-            forbidProperty "jitsiUrl"
-            -- TODO: not sure if we should really disallow these entirely
-            forbidProperty "jitsiConfig"
-            forbidProperty "jitsiClientConfig"
-            forbidProperty "jitsiRoomAdminTag"
           "jitsiTrigger" -> requireProperty "jitsiRoom"
+          "jitsiUrl" -> isForbidden
+          "jitsiConfig" -> isForbidden
+          "jitsiClientConfig" -> isForbidden
+          "jitsiRoomAdminTag" -> isForbidden
           "playAudio" -> do
             -- TODO: check for url validity?
             lift $ propEqual prop "type" "string"
@@ -149,6 +148,8 @@ checkProperty layer prop = do
             -- | forbid some property in this layer
             forbidProperty name = when (hasProperty name layer)
               $ forbid $ "property " <> quote name <> " should not be used"
+            -- | This property is forbidden and should not be used
+            isForbidden = forbid $ "property " <> quote ty <> " should not be used"
             -- TODO: check if the property has the correct value
             suggestPropertyValue name value = unless (hasProperty name layer)
               $ suggest $ "set property " <> quote name <> " to " <> quote value