diff --git a/modules/juce_osc/osc/juce_OSCReceiver.cpp b/modules/juce_osc/osc/juce_OSCReceiver.cpp
index 75da7e3cc5..ef0361fa9b 100644
--- a/modules/juce_osc/osc/juce_OSCReceiver.cpp
+++ b/modules/juce_osc/osc/juce_OSCReceiver.cpp
@@ -434,6 +434,10 @@ private:
         {
             jassert (socket != nullptr);
             char buffer[oscBufferSize];
+            socket->waitUntilReady (true, -1);
+
+            if (threadShouldExit())
+                return;
 
             const int bytesRead = socket->read (buffer, (int) sizeof (buffer), false);