diff --git a/resources/install/scripts/app/fax/resources/scripts/hangup_rx.lua b/resources/install/scripts/app/fax/resources/scripts/hangup_rx.lua
index 3167f18282..e7e623d2d9 100644
--- a/resources/install/scripts/app/fax/resources/scripts/hangup_rx.lua
+++ b/resources/install/scripts/app/fax/resources/scripts/hangup_rx.lua
@@ -54,6 +54,19 @@
 		return c;
 	end
 
+-- set channel variables to lua variables
+	domain_uuid = env:getHeader("domain_uuid");
+	domain_name = env:getHeader("domain_name");
+
+--get the domain_uuid using the domain name required for multi-tenant
+	if (domain_name ~= nil) then
+		sql = "SELECT domain_uuid FROM v_domains ";
+		sql = sql .. "WHERE domain_name = '" .. domain_name .. "' ";
+		status = dbh:query(sql, function(rows)
+			domain_uuid = rows["domain_uuid"];
+		end);
+	end
+
 --settings
 	dofile(scripts_dir.."/resources/functions/settings.lua");
 	settings = settings(domain_uuid);
@@ -93,8 +106,6 @@
 	--variable_fax_transfer_rate: 14400
 
 -- set channel variables to lua variables
-	domain_uuid = env:getHeader("domain_uuid");
-	domain_name = env:getHeader("domain_name");
 	fax_uuid = env:getHeader("fax_uuid");
 	uuid = env:getHeader("uuid");
 	fax_success = env:getHeader("fax_success");
diff --git a/resources/install/scripts/fax_retry.lua b/resources/install/scripts/fax_retry.lua
index c9d5d99f19..e4d4d12ef7 100644
--- a/resources/install/scripts/fax_retry.lua
+++ b/resources/install/scripts/fax_retry.lua
@@ -59,27 +59,6 @@
 		return c;
 	end
 
---settings
-	dofile(scripts_dir.."/resources/functions/settings.lua");
-	settings = settings(domain_uuid);
-	storage_type = "";
-	storage_path = "";
-	if (settings['fax'] ~= nil) then
-		if (settings['fax']['storage_type'] ~= nil) then
-			if (settings['fax']['storage_type']['text'] ~= nil) then
-				storage_type = settings['fax']['storage_type']['text'];
-			end
-		end
-		if (settings['fax']['storage_path'] ~= nil) then
-			if (settings['fax']['storage_path']['text'] ~= nil) then
-				storage_path = settings['fax']['storage_path']['text'];
-				storage_path = storage_path:gsub("${domain_name}", domain_name);
-				storage_path = storage_path:gsub("${voicemail_id}", voicemail_id);
-				storage_path = storage_path:gsub("${voicemail_dir}", voicemail_dir);
-			end
-		end
-	end
-
 -- show all channel variables
 	--dat = env:serialize()
 	--freeswitch.consoleLog("INFO","info:\n" .. dat .. "\n")
@@ -159,6 +138,27 @@
 		end);
 	end
 
+--settings
+	dofile(scripts_dir.."/resources/functions/settings.lua");
+	settings = settings(domain_uuid);
+	storage_type = "";
+	storage_path = "";
+	if (settings['fax'] ~= nil) then
+		if (settings['fax']['storage_type'] ~= nil) then
+			if (settings['fax']['storage_type']['text'] ~= nil) then
+				storage_type = settings['fax']['storage_type']['text'];
+			end
+		end
+		if (settings['fax']['storage_path'] ~= nil) then
+			if (settings['fax']['storage_path']['text'] ~= nil) then
+				storage_path = settings['fax']['storage_path']['text'];
+				storage_path = storage_path:gsub("${domain_name}", domain_name);
+				storage_path = storage_path:gsub("${voicemail_id}", voicemail_id);
+				storage_path = storage_path:gsub("${voicemail_dir}", voicemail_dir);
+			end
+		end
+	end
+
 --be sure accountcode is not empty
 	if (accountcode == nil) then
 		accountcode = domain_name;