diff --git a/modules/payloads/singles/windows/messagebox.rb b/modules/payloads/singles/windows/messagebox.rb
index fd26dc1b93..7a77aa6e38 100644
--- a/modules/payloads/singles/windows/messagebox.rb
+++ b/modules/payloads/singles/windows/messagebox.rb
@@ -85,6 +85,7 @@ module Metasploit3
 	;store function address at ebx+08
 	mov [ebp+0x8],eax
 EOS
+
 		doexit = <<EOS
 	xor eax,eax		;zero out eax
 	push eax		;put 0 on stack
@@ -100,12 +101,6 @@ EOS
 EOS
 			getexitfunc = ''
 		end
-		
-		# if exit is set to none, then make exit empty
-		if datastore['EXITFUNC'].upcase.strip == "NONE"
-			getexitfunc = ''
-			doexit = ''
-		end
 
 		# Generate code to get ptr to Title
 		marker_idx = strTitle.length - 1