diff --git a/modules/auxiliary/scanner/telnet/telnet_login.rb b/modules/auxiliary/scanner/telnet/telnet_login.rb
index c1bcf783b0..fd1c43b3ec 100644
--- a/modules/auxiliary/scanner/telnet/telnet_login.rb
+++ b/modules/auxiliary/scanner/telnet/telnet_login.rb
@@ -159,9 +159,10 @@ class Metasploit3 < Msf::Auxiliary
 			send_user(user)
 		end
 
+		recvd_sample = @recvd.dup
 		# Allow for slow echos
 		1.upto(10) do
-			recv_telnet(self.sock, 0.10)
+			recv_telnet(self.sock, 0.10) unless @recvd.nil? or @recvd[/#{@password_prompt}/] 
 		end
 
 		vprint_status("#{rhost}:#{rport} Prompt: #{@recvd.gsub(/[\r\n\e\b\a]/, ' ')}")
@@ -171,7 +172,7 @@ class Metasploit3 < Msf::Auxiliary
 
 			# Allow for slow echos
 			1.upto(10) do
-				recv_telnet(self.sock, 0.10)
+				recv_telnet(self.sock, 0.10) if @recvd == recvd_sample
 			end