diff --git a/src/libs/tracing/timelinetracemanager.cpp b/src/libs/tracing/timelinetracemanager.cpp
index 61b9e6257fd..9504d7d60ad 100644
--- a/src/libs/tracing/timelinetracemanager.cpp
+++ b/src/libs/tracing/timelinetracemanager.cpp
@@ -357,7 +357,6 @@ void TimelineTraceManager::clearEventStorage()
     d->reset();
     if (d->notesModel)
         d->notesModel->clear();
-    setVisibleFeatures(0);
     setRecordedFeatures(0);
     d->eventStorage->clear();
 }
@@ -385,7 +384,6 @@ void TimelineTraceManager::restrictByFilter(TraceEventFilter filter)
         d->notesModel->stash();
 
     d->reset();
-    setVisibleFeatures(0);
 
     QFutureInterface<void> future;
     replayEvents(filter(std::bind(&TimelineTraceManagerPrivate::dispatch, d,
diff --git a/src/plugins/qmlprofiler/qmlprofilertimelinemodel.cpp b/src/plugins/qmlprofiler/qmlprofilertimelinemodel.cpp
index 82b6ba563b8..675646ea4c5 100644
--- a/src/plugins/qmlprofiler/qmlprofilertimelinemodel.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilertimelinemodel.cpp
@@ -105,6 +105,7 @@ QVariantMap QmlProfilerTimelineModel::locationFromTypeId(int index) const
 
 void QmlProfilerTimelineModel::initialize()
 {
+    setHidden(!(modelManager()->visibleFeatures() & (1ULL << m_mainFeature)));
 }
 
 void QmlProfilerTimelineModel::finalize()
diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp
index af0ae935a80..94b74c1504e 100644
--- a/src/plugins/qmlprofiler/qmlprofilertool.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp
@@ -662,18 +662,6 @@ bool QmlProfilerTool::checkForUnsavedNotes()
                                 QMessageBox::Yes, QMessageBox::No) == QMessageBox::Yes;
 }
 
-void QmlProfilerTool::restoreFeatureVisibility()
-{
-    // Restore the shown/hidden state of features to what the user selected. When clearing data the
-    // the model manager sets its features to 0, and models get automatically shown, for the mockup.
-    quint64 features = 0;
-    foreach (const QAction *action, d->m_displayFeaturesMenu->actions()) {
-        if (action->isChecked())
-            features |= (1ULL << action->data().toUInt());
-    }
-    d->m_profilerModelManager->setVisibleFeatures(features);
-}
-
 void QmlProfilerTool::clientsDisconnected()
 {
     if (d->m_toolBusy) {
@@ -745,7 +733,6 @@ void QmlProfilerTool::setRecordedFeatures(quint64 features)
 
 void QmlProfilerTool::initialize()
 {
-    restoreFeatureVisibility();
     setButtonsEnabled(false);            // Other buttons disabled
 }
 
diff --git a/src/plugins/qmlprofiler/qmlprofilertool.h b/src/plugins/qmlprofiler/qmlprofilertool.h
index c96a40587f3..180f1c090cf 100644
--- a/src/plugins/qmlprofiler/qmlprofilertool.h
+++ b/src/plugins/qmlprofiler/qmlprofilertool.h
@@ -103,7 +103,6 @@ private:
     template<ProfileFeature feature>
     void updateFeatures(quint64 features);
     bool checkForUnsavedNotes();
-    void restoreFeatureVisibility();
     void setButtonsEnabled(bool enable);
     void createInitialTextMarks();