Fix extra enqueued message when redirecting back