diff --git a/river/init.lua b/river/init.lua
index 72bc72e..581ba88 100755
--- a/river/init.lua
+++ b/river/init.lua
@@ -343,9 +343,12 @@ for map_type, tbl in pairs(mappings) do
       else
         opt = '-' .. opt
       end
-
-      -- -layout 0 is hardcoded to make mappings work on any layout
-      os.execute(string.format('riverctl %s -layout 0 %s %s %s %s %s', map_type, opt, mode, modifiers, binding.key, cmd))
+      local layout = ''
+      -- -layout 0 is hardcoded on 'riverctl map *' to make mappings work on any layout
+      if map_type == 'map' then
+        layout = '-layout 0'
+      end
+      os.execute(string.format('riverctl %s %s %s %s %s %s %s', map_type, layout, opt, mode, modifiers, binding.key, cmd))
 
       -- Duplicate mappings of mode 'locked' for mode 'normal'
       if mode == 'locked' then