Backend - Fixed redirect issues if key is not present