diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc
index d33ba0af4d..59942f8d81 100644
--- a/libs/ardour/tempo.cc
+++ b/libs/ardour/tempo.cc
@@ -2908,6 +2908,18 @@ TempoMap::set_state (const XMLNode& node, int /*version*/)
 			_metrics.sort (cmp);
 		}
 
+		/* check for legacy sessions where bbt was the base musical unit for tempo */
+		for (Metrics::const_iterator i = _metrics.begin(); i != _metrics.end(); ++i) {
+			TempoSection* t;
+			if ((t = dynamic_cast<TempoSection*> (*i)) != 0) {
+				if (t->legacy_bbt().bars != 0) {
+					fix_legacy_session();
+					break;
+				}
+				break;
+			}
+		}
+
 		/* check for multiple tempo/meters at the same location, which
 		   ardour2 somehow allowed.
 		*/
@@ -2936,18 +2948,6 @@ TempoMap::set_state (const XMLNode& node, int /*version*/)
 			prev = i;
 		}
 
-		/* check for legacy sessions where bbt was the base musical unit for tempo */
-		for (Metrics::const_iterator i = _metrics.begin(); i != _metrics.end(); ++i) {
-			TempoSection* t;
-			if ((t = dynamic_cast<TempoSection*> (*i)) != 0) {
-				if (t->legacy_bbt().bars != 0) {
-					fix_legacy_session();
-					break;
-				}
-				break;
-			}
-		}
-
 		recompute_map (_metrics);
 	}