fix(production): production page crash fix

My previous fix for #907 (closed) has been reverted by this recent merge request

Applying the same solution as a fix