Add IS_DEV_SERVER check on second conditional as well.
Fixes #913.
Merge pull request #914 from rahaeli/historyview

Add IS_DEV_SERVER check on second conditional as well.