diff --git a/lib/Properties.hs b/lib/Properties.hs
index 262f427cbeb27a9ed7a989bff4762e1091d5a2b1..7772c261aed442d54d80a9a52892812c90dc129f 100644
--- a/lib/Properties.hs
+++ b/lib/Properties.hs
@@ -154,8 +154,13 @@ checkLayerProperty p@(Property name _value) = case name of
         >>= setProperty "jitsiRoomAdminTag"
         . ("assembly-" <>) -- prepend "assembly-" to avoid namespace clashes
       uselessEmptyLayer
-      unwrapString' p
-        $ suggestProperty $ Property "jitsiTrigger" "onaction"
+      unwrapString p $ \jitsiRoom -> do
+        suggestProperty $ Property "jitsiTrigger" "onaction"
+
+        -- prepend jitsi room names to avoid name clashes
+        unless ("shared-" `isPrefixOf` jitsiRoom) $ do
+          assemblyname <- lintConfig configAssemblyTag
+          setProperty "jitsiRoom" (assemblyname <> "-" <> jitsiRoom)
     "jitsiTrigger" -> do
       isString p
       unlessHasProperty "jitsiTriggerMessage"