diff --git a/includes/install/scripts/app/voicemail/index.lua b/includes/install/scripts/app/voicemail/index.lua
index 3e29423599..4656a53655 100644
--- a/includes/install/scripts/app/voicemail/index.lua
+++ b/includes/install/scripts/app/voicemail/index.lua
@@ -218,9 +218,6 @@
 		--valid voicemail
 			if (voicemail_uuid ~= nil) then
 
-				--make sure the voicemail directory exists
-					mkdir(voicemail_dir.."/"..voicemail_id);
-
 				--save the recording
 					timeouts = 0;
 					play_greeting();
diff --git a/includes/install/scripts/app/voicemail/resources/functions/record_greeting.lua b/includes/install/scripts/app/voicemail/resources/functions/record_greeting.lua
index dc9c8a6e91..940fc98f6d 100644
--- a/includes/install/scripts/app/voicemail/resources/functions/record_greeting.lua
+++ b/includes/install/scripts/app/voicemail/resources/functions/record_greeting.lua
@@ -57,6 +57,7 @@
 						max_len_seconds = 30;
 						silence_threshold = 30;
 						silence_seconds = 5;
+						mkdir(voicemail_dir.."/"..voicemail_id);
 						-- syntax is session:recordFile(file_name, max_len_secs, silence_threshold, silence_secs)
 						result = session:recordFile(voicemail_dir.."/"..voicemail_id.."/greeting_"..greeting_id..".wav", max_len_seconds, silence_threshold, silence_seconds);
 						--session:execute("record", voicemail_dir.."/"..uuid.." 180 200");