diff --git a/CMakeLists.txt b/CMakeLists.txt
index 558824badaa..c5d88da8f85 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -666,6 +666,14 @@ else()
   message( STATUS "No JUCE Host Context Support in this version" )
 endif()
 
+set(SURGE_JUCE_VST3_EXTENSIONS FALSE)
+if(EXISTS ${SURGE_JUCE_LOCATION}/modules/juce_audio_processors/utilities/juce_VST3ClientExtensions.h )
+  set(SURGE_JUCE_VST3_EXTENSIONS TRUE)
+  message( STATUS "Including JUCE VST3 Client Extensions")
+else()
+  message( STATUS "No JUCE VST3 Client Extensions" )
+endif()
+
 
 set(JUCE_ASIO_SUPPORT FALSE)
 if( BUILD_USING_MY_ASIO_LICENSE )
@@ -906,6 +914,13 @@ if( BUILD_SURGE_XT )
     set( SURGE_JUCE_HOST_CONTEXT_DEFINE 0)
   endif()
 
+  if (${SURGE_JUCE_VST3_EXTENSIONS})
+    set( SURGE_JUCE_VST3_EXTENSIONS 1)
+  else()
+    set( SURGE_JUCE_VST3_EXTENSIONS 0)
+  endif()
+
+
   target_compile_definitions(surge-xt PUBLIC
           JUCE_ALLOW_STATIC_NULL_VARIABLES=0
           JUCE_STRICT_REFCOUNTEDPOINTER=1
@@ -930,6 +945,7 @@ if( BUILD_SURGE_XT )
 
           SURGE_JUCE_ACCESSIBLE=${SURGE_JUCE_ACCESSIBLE_DEFINE}
           SURGE_JUCE_HOST_CONTEXT=${SURGE_JUCE_HOST_CONTEXT_DEFINE}
+          SURGE_JUCE_VST3_EXTENSIONS=${SURGE_JUCE_VST3_EXTENSIONS}
 
           TARGET_JUCE_SYNTH=1
           TARGET_HEADLESS=1
diff --git a/libs/JUCE b/libs/JUCE
index 99112cf71f0..802f33b0e86 160000
--- a/libs/JUCE
+++ b/libs/JUCE
@@ -1 +1 @@
-Subproject commit 99112cf71f0cc3aafa4622b62cf81f2b7df38f0b
+Subproject commit 802f33b0e865011aca07058fe5644cae27a46b8f
diff --git a/src/surge_synth_juce/SurgeSynthProcessor.h b/src/surge_synth_juce/SurgeSynthProcessor.h
index 4400aaf01e7..44948e601a7 100644
--- a/src/surge_synth_juce/SurgeSynthProcessor.h
+++ b/src/surge_synth_juce/SurgeSynthProcessor.h
@@ -144,8 +144,12 @@ struct SurgeMacroToJuceParamAdapter : public juce::RangedAudioParameter
 };
 
 class SurgeSynthProcessor : public juce::AudioProcessor,
+#if SURGE_JUCE_VST3_EXTENSIONS
+                            public juce::VST3ClientExtensions,
+#endif
                             public SurgeSynthesizer::PluginLayer,
                             public juce::MidiKeyboardState::Listener
+
 {
   public:
     //==============================================================================
@@ -209,6 +213,10 @@ class SurgeSynthProcessor : public juce::AudioProcessor,
     std::string paramClumpName(int clumpid);
     juce::MidiKeyboardState midiKeyboardState;
 
+#if SURGE_JUCE_VST3_EXTENSIONS
+    bool getPluginHasMainInput() const override { return false; }
+#endif
+
   private:
     std::vector<SurgeParamToJuceParamAdapter *> paramAdapters;