diff --git a/.gitmodules b/.gitmodules
index a1f99fd7..441fc807 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,7 +13,7 @@
 	shallow = true
 [submodule "vst/external/VST_SDK/VST3_SDK/public.sdk"]
 	path = plugins/vst/external/VST_SDK/VST3_SDK/public.sdk
-	url = https://github.com/sfztools/vst3_public_sdk.git
+	url = https://github.com/steinbergmedia/vst3_public_sdk.git
 	shallow = true
 [submodule "vst/external/VST_SDK/VST3_SDK/vstgui4"]
 	path = plugins/editor/external/vstgui4
diff --git a/plugins/vst/SfizzVstController.cpp b/plugins/vst/SfizzVstController.cpp
index a3d38f07..dcf66b67 100644
--- a/plugins/vst/SfizzVstController.cpp
+++ b/plugins/vst/SfizzVstController.cpp
@@ -364,8 +364,7 @@ tresult SfizzVstControllerNoUi::notify(Vst::IMessage* message)
         }
 
         if (Vst::IComponentHandler* componentHandler = getComponentHandler())
-            // NOTE(jpc) I think that's the right one, but it needs confirmation
-            componentHandler->restartComponent(Vst::kNoteExpressionChanged);
+            componentHandler->restartComponent(Vst::kKeyswitchChanged);
 
         // update the parameter titles and notify
         for (uint32 cc = 0; cc < sfz::config::numCCs; ++cc) {
diff --git a/plugins/vst/cmake/Vst3.cmake b/plugins/vst/cmake/Vst3.cmake
index c05706dd..f461453f 100644
--- a/plugins/vst/cmake/Vst3.cmake
+++ b/plugins/vst/cmake/Vst3.cmake
@@ -30,7 +30,8 @@ add_library(vst3sdk STATIC EXCLUDE_FROM_ALL
     "${VST3SDK_BASEDIR}/public.sdk/source/vst/vstnoteexpressiontypes.cpp"
     "${VST3SDK_BASEDIR}/public.sdk/source/vst/vstparameters.cpp"
     "${VST3SDK_BASEDIR}/public.sdk/source/vst/vstpresetfile.cpp"
-    "${VST3SDK_BASEDIR}/public.sdk/source/vst/vstrepresentation.cpp")
+    "${VST3SDK_BASEDIR}/public.sdk/source/vst/vstrepresentation.cpp"
+    "${VST3SDK_BASEDIR}/public.sdk/source/vst/utility/stringconvert.cpp")
 if(WIN32)
     target_sources(vst3sdk PRIVATE
         "${VST3SDK_BASEDIR}/public.sdk/source/common/threadchecker_win32.cpp")
diff --git a/plugins/vst/external/VST_SDK/VST3_SDK/pluginterfaces b/plugins/vst/external/VST_SDK/VST3_SDK/pluginterfaces
index b8566ef3..93cef1af 160000
--- a/plugins/vst/external/VST_SDK/VST3_SDK/pluginterfaces
+++ b/plugins/vst/external/VST_SDK/VST3_SDK/pluginterfaces
@@ -1 +1 @@
-Subproject commit b8566ef3b2a0cba60a96e3ef2001224c865c8b36
+Subproject commit 93cef1afb7061e488625045ba5a82abaa83d27fe
diff --git a/plugins/vst/external/VST_SDK/VST3_SDK/public.sdk b/plugins/vst/external/VST_SDK/VST3_SDK/public.sdk
index d69d011f..9589800e 160000
--- a/plugins/vst/external/VST_SDK/VST3_SDK/public.sdk
+++ b/plugins/vst/external/VST_SDK/VST3_SDK/public.sdk
@@ -1 +1 @@
-Subproject commit d69d011fa08c3977928f7da0010f8938f93fd370
+Subproject commit 9589800ed94573354bc29de45eec5744523fbfcb