Fix just broken history on startup
Merge branch 'fix-just-broken-history-on-startup'

Fix just broken history on startup.