diff --git a/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp b/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp
index 4589307926..76d9482c0e 100644
--- a/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp
+++ b/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp
@@ -423,7 +423,7 @@ struct AAXClasses
 
                 case JUCEAlgorithmIDs::preparedFlag:
                 {
-                    preparePlugin();
+                    const_cast<JuceAAX_Processor*>(this)->preparePlugin();
 
                     const size_t numObjects = dataSize / sizeof (uint32_t);
                     uint32_t* const objects = static_cast <uint32_t*> (data);
@@ -665,7 +665,7 @@ struct AAXClasses
             }
         }
 
-        void preparePlugin() const
+        void preparePlugin()
         {
             AAX_EStemFormat inputStemFormat = AAX_eStemFormat_None;
             check (Controller()->GetInputStemFormat (&inputStemFormat));
@@ -675,13 +675,11 @@ struct AAXClasses
             check (Controller()->GetOutputStemFormat (&outputStemFormat));
             const int numberOfOutputChannels = getNumChannelsForStemFormat (outputStemFormat);
 
-            int32_t bufferSize = 0;
-            check (Controller()->GetSignalLatency (&bufferSize));
+            AudioProcessor& audioProcessor = getPluginInstance();
+            check (Controller()->SetSignalLatency (audioProcessor.getLatencySamples()));
 
             const AAX_CSampleRate sampleRate = getSampleRate();
-
-            AudioProcessor& audioProcessor = getPluginInstance();
-            audioProcessor.setPlayConfigDetails (numberOfInputChannels, numberOfOutputChannels, sampleRate, bufferSize);
+            audioProcessor.setPlayConfigDetails (numberOfInputChannels, numberOfOutputChannels, sampleRate, 0);
             audioProcessor.prepareToPlay (sampleRate, bufferSize);
         }