diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index a7741abb29..14ec08f75e 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -424,6 +424,8 @@ Session::Session (AudioEngine &eng,
 			destroy ();
 			throw SessionException (_("Failed to load state"));
 		}
+
+		ensure_subdirs (); // archived or zipped sessions may lack peaks/ analysis/ etc
 	}
 
 	/* apply the loaded state_tree */
@@ -509,8 +511,6 @@ Session::Session (AudioEngine &eng,
 	_engine.set_session (this);
 	_engine.reset_timebase ();
 
-	ensure_subdirs (); // archived or zipped sessions may lack peaks/ analysis/ etc
-
 	if (!mix_template.empty ()) {
 		/* ::create() unsets _is_new after creating the session.
 		 * But for templated sessions, the sample-rate is initially unset
diff --git a/libs/ardour/source.cc b/libs/ardour/source.cc
index 3f0e6991df..ab61d79628 100644
--- a/libs/ardour/source.cc
+++ b/libs/ardour/source.cc
@@ -368,10 +368,6 @@ Source::get_transients_path () const
 	vector<string> parts;
 	string s;
 
-	/* old sessions may not have the analysis directory */
-
-	_session.ensure_subdirs ();
-
 	s = _session.analysis_dir ();
 	parts.push_back (s);