diff --git a/resources/install/scripts/app/voicemail/resources/functions/check_password.lua b/resources/install/scripts/app/voicemail/resources/functions/check_password.lua
index b95cf1feae..674d7fbcbd 100644
--- a/resources/install/scripts/app/voicemail/resources/functions/check_password.lua
+++ b/resources/install/scripts/app/voicemail/resources/functions/check_password.lua
@@ -61,6 +61,12 @@
 						end);
 					end
 				end
+
+			-- check either we found valid voicemail box
+				if (not voicemail_uuid) or (#voicemail_uuid == 0) then
+					return session:hangup();
+				end
+
 			--please enter your password followed by pound
 				dtmf_digits = '';
 				password = macro(session, "voicemail_password", 20, 5000, '');