diff --git a/src/scripts/default-nodes/find-echo-cancel-default-node.lua b/src/scripts/default-nodes/find-echo-cancel-default-node.lua
index 045fbe4f..ba44e3d4 100644
--- a/src/scripts/default-nodes/find-echo-cancel-default-node.lua
+++ b/src/scripts/default-nodes/find-echo-cancel-default-node.lua
@@ -29,10 +29,10 @@ find_echo_cancel_default_node_hook = SimpleEventHook {
     end
 
     -- Get the part after "audio." (= 6 characters)
-    local srcsink = props ["default-node.type"]:sub (6)
+    local srcsink = props ["default-node.type"]:sub (7)
 
     for _, node_props in ipairs (available_nodes) do
-      if isEchoCancelNode (node_props) then
+      if isEchoCancelNode (node_props, srcsink) then
         local priority = node_props ["priority.session"]
         priority = math.tointeger (priority) or 0
         priority = priority + 10001 - i
diff --git a/src/scripts/default-nodes/state-default-nodes.lua b/src/scripts/default-nodes/state-default-nodes.lua
index fd18168a..6f5a40ec 100644
--- a/src/scripts/default-nodes/state-default-nodes.lua
+++ b/src/scripts/default-nodes/state-default-nodes.lua
@@ -89,7 +89,7 @@ store_configured_default_nodes_hook = SimpleEventHook {
   execute = function (event)
     local props = event:get_properties ()
     -- get the part after "default.configured." (= 19 chars)
-    local def_node_type = props ["event.subject.key"]:sub (19)
+    local def_node_type = props ["event.subject.key"]:sub (20)
     local new_value = props ["event.subject.value"]
     local new_stored = {}