diff --git a/src/libs/timeline/timelinemodel.cpp b/src/libs/timeline/timelinemodel.cpp
index 099492114c2..2b1d7d50cc1 100644
--- a/src/libs/timeline/timelinemodel.cpp
+++ b/src/libs/timeline/timelinemodel.cpp
@@ -136,6 +136,8 @@ void TimelineModel::setExpandedRowCount(int rows)
 {
     Q_D(TimelineModel);
     if (d->expandedRowCount != rows) {
+        if (d->rowOffsets.length() > rows)
+            d->rowOffsets.resize(rows);
         d->expandedRowCount = rows;
         emit expandedRowCountChanged();
         if (d->expanded)
diff --git a/tests/auto/timeline/timelinemodel/tst_timelinemodel.cpp b/tests/auto/timeline/timelinemodel/tst_timelinemodel.cpp
index 7080d11bbaa..078bcbb04eb 100644
--- a/tests/auto/timeline/timelinemodel/tst_timelinemodel.cpp
+++ b/tests/auto/timeline/timelinemodel/tst_timelinemodel.cpp
@@ -232,8 +232,12 @@ void tst_TimelineModel::height()
     QCOMPARE(dummy.height(), 2 * DefaultRowHeight);
     dummy.setExpanded(true);
     QCOMPARE(dummy.height(), 3 * DefaultRowHeight);
-    dummy.setExpandedRowHeight(0, 80);
+    dummy.setExpandedRowHeight(1, 80);
     QCOMPARE(dummy.height(), 2 * DefaultRowHeight + 80);
+    dummy.clear();
+    dummy.loadData();
+    dummy.setExpanded(true);
+    QCOMPARE(dummy.rowHeight(1), DefaultRowHeight); // Make sure the row height gets reset.
 }
 
 void tst_TimelineModel::count()