diff --git a/libs/clap-juce-extensions b/libs/clap-juce-extensions
index cf93cac7ca6..a40d845f738 160000
--- a/libs/clap-juce-extensions
+++ b/libs/clap-juce-extensions
@@ -1 +1 @@
-Subproject commit cf93cac7ca6a1c0c548c2bda85d49e9bfdb979e1
+Subproject commit a40d845f73852dfe15f3ef5a9b9f9f5fb7b69b84
diff --git a/src/surge-xt/CMakeLists.txt b/src/surge-xt/CMakeLists.txt
index 7bb004a6107..07faab57a5f 100644
--- a/src/surge-xt/CMakeLists.txt
+++ b/src/surge-xt/CMakeLists.txt
@@ -56,6 +56,7 @@ juce_add_plugin(${PROJECT_NAME}
 if(SURGE_BUILD_CLAP)
   clap_juce_extensions_plugin(TARGET surge-xt
     CLAP_ID "org.surge-synth-team.surge-xt"
+    CLAP_SUPPORTS_CUSTOM_FACTORY 1
     CLAP_FEATURES "instrument" "synthesizer" "hybrid" "free and open source")
 endif()
 
diff --git a/src/surge-xt/SurgeSynthProcessor.cpp b/src/surge-xt/SurgeSynthProcessor.cpp
index 31c9959a9be..0030ec0e151 100644
--- a/src/surge-xt/SurgeSynthProcessor.cpp
+++ b/src/surge-xt/SurgeSynthProcessor.cpp
@@ -1023,3 +1023,10 @@ void SurgeSynthProcessor::reset() { blockPos = 0; }
 //==============================================================================
 // This creates new instances of the plugin..
 juce::AudioProcessor *JUCE_CALLTYPE createPluginFilter() { return new SurgeSynthProcessor(); }
+
+void *JUCE_CALLTYPE clapJuceExtensionCustomFactory(const char *)
+{
+    // ToDo: Implement preset discovery here
+    // See #6930
+    return nullptr;
+}
\ No newline at end of file