diff --git a/libs/ardour/ardour/vst3_plugin.h b/libs/ardour/ardour/vst3_plugin.h
index a241fa70dc..bb4cdc1d7c 100644
--- a/libs/ardour/ardour/vst3_plugin.h
+++ b/libs/ardour/ardour/vst3_plugin.h
@@ -471,7 +471,7 @@ private:
 
 /* ****************************************************************************/
 
-class LIBARDOUR_API VST3PluginInfo : public PluginInfo
+class LIBARDOUR_API VST3PluginInfo : public PluginInfo, public std::enable_shared_from_this<ARDOUR::VST3PluginInfo>
 {
 public:
 	VST3PluginInfo ();
@@ -482,7 +482,7 @@ public:
 	bool                              is_instrument () const;
 	PBD::Searchpath                   preset_search_path () const;
 
-	mutable boost::optional<bool>     has_editor;
+	boost::optional<bool>             has_editor;
 
 	std::shared_ptr<VST3PluginModule> m;
 };
diff --git a/libs/ardour/vst3_plugin.cc b/libs/ardour/vst3_plugin.cc
index e6ce1beafa..2ce08cdd83 100644
--- a/libs/ardour/vst3_plugin.cc
+++ b/libs/ardour/vst3_plugin.cc
@@ -1068,7 +1068,7 @@ VST3PluginInfo::load (Session& session)
 		PluginPtr          plugin;
 		Steinberg::VST3PI* plug = new VST3PI (m, unique_id);
 		plugin.reset (new VST3Plugin (session.engine (), session, plug));
-		plugin->set_info (PluginInfoPtr (new VST3PluginInfo (*this)));
+		plugin->set_info (PluginInfoPtr (shared_from_this ()));
 		return plugin;
 	} catch (failed_constructor& err) {
 		;