Prevent 400 error when using navigation buttons. (cherry picked from commit 8b69b0f5217e7dcda395449a56d59571b264b2a6) Signed-off-by: crobibero <cody@robibe.ro>