diff --git a/lib/net/imap.rb b/lib/net/imap.rb
index 3a8145e03c..980fed61ca 100644
--- a/lib/net/imap.rb
+++ b/lib/net/imap.rb
@@ -1017,7 +1017,8 @@ module Net
     end
 
     def receive_responses
-      while true
+      connection_closed = false
+      until connection_closed
         synchronize do
           @exception = nil
         end
@@ -1054,7 +1055,7 @@ module Net
               if resp.name == "BYE" && @logout_command_tag.nil?
                 @sock.close
                 @exception = ByeResponseError.new(resp)
-                break
+                connection_closed = true
               end
             when ContinuationRequest
               @continuation_request_arrival.signal
diff --git a/test/net/imap/test_imap.rb b/test/net/imap/test_imap.rb
index f1471c0d0b..b7714dff1a 100644
--- a/test/net/imap/test_imap.rb
+++ b/test/net/imap/test_imap.rb
@@ -279,6 +279,34 @@ class IMAPTest < Test::Unit::TestCase
     end
   end
 
+  def test_unexpected_bye
+    server = TCPServer.new(0)
+    port = server.addr[1]
+    Thread.start do
+      begin
+        sock = server.accept
+        begin
+          sock.print("* OK Gimap ready for requests from 75.101.246.151 33if2752585qyk.26\r\n")
+          sock.gets
+          sock.print("* BYE System Error 33if2752585qyk.26\r\n")
+        ensure
+          sock.close
+        end
+      rescue
+      end
+    end
+    begin
+      begin
+        imap = Net::IMAP.new("localhost", :port => port)
+        assert_raise(Net::IMAP::ByeResponseError) do
+          imap.login("user", "password")
+        end
+      end
+    ensure
+      server.close
+    end
+  end
+
   private
 
   def imaps_test