diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc
index 791a5d62a3..89f3e94bfb 100644
--- a/libs/ardour/audioengine.cc
+++ b/libs/ardour/audioengine.cc
@@ -96,25 +96,6 @@ AudioEngine::AudioEngine (string client_name, string session_uuid)
 	}
 
 	Port::set_engine (this);
-
-	// Initialize parameter metadata (e.g. ranges)
-	Evoral::Parameter p(NullAutomation);
-	p = EventTypeMap::instance().new_parameter(NullAutomation);
-	p = EventTypeMap::instance().new_parameter(GainAutomation);
-	p = EventTypeMap::instance().new_parameter(PanAzimuthAutomation);
-	p = EventTypeMap::instance().new_parameter(PanElevationAutomation);
-	p = EventTypeMap::instance().new_parameter(PanWidthAutomation);
-	p = EventTypeMap::instance().new_parameter(PluginAutomation);
-	p = EventTypeMap::instance().new_parameter(SoloAutomation);
-	p = EventTypeMap::instance().new_parameter(MuteAutomation);
-	p = EventTypeMap::instance().new_parameter(MidiCCAutomation);
-	p = EventTypeMap::instance().new_parameter(MidiPgmChangeAutomation);
-	p = EventTypeMap::instance().new_parameter(MidiPitchBenderAutomation);
-	p = EventTypeMap::instance().new_parameter(MidiChannelPressureAutomation);
-	p = EventTypeMap::instance().new_parameter(FadeInAutomation);
-	p = EventTypeMap::instance().new_parameter(FadeOutAutomation);
-	p = EventTypeMap::instance().new_parameter(EnvelopeAutomation);
-	p = EventTypeMap::instance().new_parameter(MidiCCAutomation);
 }
 
 AudioEngine::~AudioEngine ()
diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index 6e6dd70856..d8f06d9a8a 100644
--- a/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@ -328,6 +328,24 @@ ARDOUR::init (bool use_vst, bool try_optimization)
 
         PannerManager::instance().discover_panners();
 
+	// Initialize parameter metadata
+	EventTypeMap::instance().new_parameter(NullAutomation);
+	EventTypeMap::instance().new_parameter(GainAutomation);
+	EventTypeMap::instance().new_parameter(PanAzimuthAutomation);
+	EventTypeMap::instance().new_parameter(PanElevationAutomation);
+	EventTypeMap::instance().new_parameter(PanWidthAutomation);
+	EventTypeMap::instance().new_parameter(PluginAutomation);
+	EventTypeMap::instance().new_parameter(SoloAutomation);
+	EventTypeMap::instance().new_parameter(MuteAutomation);
+	EventTypeMap::instance().new_parameter(MidiCCAutomation);
+	EventTypeMap::instance().new_parameter(MidiPgmChangeAutomation);
+	EventTypeMap::instance().new_parameter(MidiPitchBenderAutomation);
+	EventTypeMap::instance().new_parameter(MidiChannelPressureAutomation);
+	EventTypeMap::instance().new_parameter(FadeInAutomation);
+	EventTypeMap::instance().new_parameter(FadeOutAutomation);
+	EventTypeMap::instance().new_parameter(EnvelopeAutomation);
+	EventTypeMap::instance().new_parameter(MidiCCAutomation);
+
 	return 0;
 }