solved bug in reload page without data
Merge branch 'fix/bug-on-reload-page' into develop