diff --git a/modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.cpp b/modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.cpp
index 9cc71f1f6d..4a18ca53d3 100644
--- a/modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.cpp
+++ b/modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.cpp
@@ -551,6 +551,11 @@ double AudioDeviceManager::chooseBestSampleRate (double rate) const
 
     const Array<double> rates (currentAudioDevice->getAvailableSampleRates());
 
+    if (rate > 0 && rates.contains (rate))
+        return rate;
+
+    rate = currentAudioDevice->getCurrentSampleRate();
+
     if (rate > 0 && rates.contains (rate))
         return rate;
 
diff --git a/modules/juce_audio_devices/native/juce_mac_CoreAudio.cpp b/modules/juce_audio_devices/native/juce_mac_CoreAudio.cpp
index 0061b0fb44..00ac3f64c5 100644
--- a/modules/juce_audio_devices/native/juce_mac_CoreAudio.cpp
+++ b/modules/juce_audio_devices/native/juce_mac_CoreAudio.cpp
@@ -1067,6 +1067,12 @@ public:
         jassert (! isOpen());
         jassert (! device->isOpen());
         devices.add (new DeviceWrapper (*this, device, useInputs, useOutputs));
+
+        if (currentSampleRate == 0)
+            currentSampleRate = device->getCurrentSampleRate();
+
+        if (currentBufferSize == 0)
+            currentBufferSize = device->getCurrentBufferSizeSamples();
     }
 
     Array<AudioIODevice*> getDevices() const