diff --git a/app/dialplans/resources/switch/conf/dialplan/050_record_all.xml b/app/dialplans/resources/switch/conf/dialplan/050_record_all.xml
index 48087fc7ee..be2c67ea20 100644
--- a/app/dialplans/resources/switch/conf/dialplan/050_record_all.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/050_record_all.xml
@@ -12,12 +12,12 @@
 		<action application="set" data="record_path=${recordings_dir}/${domain_name}/archive/${strftime(%Y)}/${strftime(%b)}/${strftime(%d)}" inline="true"/>
 		<action application="set" data="record_name=${uuid}.${record_ext}" inline="true"/>
 		<action application="mkdir" data="${record_path}"/>
-		<action application="set" data="recording_follow_transfer=true" inline="true"/>
 		<action application="bind_digit_action" data="local,*5,api:uuid_record,${uuid} mask ${recordings_dir}/${domain_name}/archive/${strftime(%Y)}/${strftime(%b)}/${strftime(%d)}/${uuid}.${record_ext},both,self"/>
 		<action application="bind_digit_action" data="local,*6,api:uuid_record,${uuid} unmask ${recordings_dir}/${domain_name}/archive/${strftime(%Y)}/${strftime(%b)}/${strftime(%d)}/${uuid}.${record_ext},both,self"/>
 		<action application="set" data="record_append=true" inline="true"/>
 		<action application="set" data="record_in_progress=true" inline="true"/>
-		<action application="set" data="api_on_answer=uuid_record ${uuid} start ${record_path}/${record_name}" inline="false"/>
+		<action application="set" data="recording_follow_transfer=true" inline="true"/>
+		<action application="set" data="uuid_record_result=${uuid_record ${uuid} start ${record_path}/${record_name}}" inline="false" enabled="true"/>
 		<action application="set" data="record_answer_req=true"/>
 		<action application="record_session" data="${record_path}/${record_name}"/>
 	</condition>
diff --git a/app/switch/resources/scripts/app/dialplan/resources/after/010_user_record.lua.noload b/app/switch/resources/scripts/app/dialplan/resources/after/010_user_record.lua.noload
index 95f82f446b..bebb73c682 100644
--- a/app/switch/resources/scripts/app/dialplan/resources/after/010_user_record.lua.noload
+++ b/app/switch/resources/scripts/app/dialplan/resources/after/010_user_record.lua.noload
@@ -80,8 +80,8 @@
 
 		--record the session
 			if (record_session) then
-				cmd = "uuid_record "..uuid.." start "..path.."/"..uuid.."."..record_ext;
-				session:execute("set", "api_on_answer="..cmd);
-				--freeswitch.consoleLog("notice", "[app:dialplan] "..cmd.."\n");
+				command = "uuid_record_result='${uuid_record "..uuid.." start "..path.."/"..uuid.."."..record_ext .."}'";
+				session:execute("set", command);
+				--freeswitch.consoleLog("notice", "[app:dialplan] " .. command .. "\n");
 			end
 	end
diff --git a/app/switch/resources/scripts/app/follow_me/index.lua b/app/switch/resources/scripts/app/follow_me/index.lua
index 9bc8c929eb..60f6a43549 100644
--- a/app/switch/resources/scripts/app/follow_me/index.lua
+++ b/app/switch/resources/scripts/app/follow_me/index.lua
@@ -429,7 +429,7 @@
 						local record_ext = session:getVariable("record_ext") or "wav";
 						local record_name = uuid.."."..record_ext;
 						local record_path = recordings_dir .. "/" .. domain_name .. "/archive/" .. os.date("%Y/%b/%d");
-						record_session = ",api_on_answer='uuid_record "..uuid.." start ".. record_path .. "/" .. record_name .. "',record_path='".. record_path .."',record_name="..record_name;
+						record_session = ",uuid_record_result='${uuid_record "..uuid.." start ".. record_path .. "/" .. record_name .. "}',record_path='".. record_path .."',record_name="..record_name;
 					end
 				end
 
diff --git a/app/switch/resources/scripts/app/ring_groups/index.lua b/app/switch/resources/scripts/app/ring_groups/index.lua
index 41c7aadd9e..0e7854a492 100644
--- a/app/switch/resources/scripts/app/ring_groups/index.lua
+++ b/app/switch/resources/scripts/app/ring_groups/index.lua
@@ -1041,7 +1041,7 @@
 					--record the session
 						if (record_session) then
 							session:setVariable("record_stereo", "true");
-							record_session = ",api_on_answer='uuid_record "..uuid.." start ".. record_path .. "/" .. record_name .. "',record_path='".. record_path .."',record_name="..record_name;
+							record_session = ",uuid_record_result='${uuid_record "..uuid.." start ".. record_path .. "/" .. record_name .. "}',record_path='".. record_path .."',record_name="..record_name;
 							session:setVariable("record_path", record_path);
 						else
 							record_session = '';