diff --git a/server/controllers/auth.js b/server/controllers/auth.js
index 733486be0..e18dac406 100644
--- a/server/controllers/auth.js
+++ b/server/controllers/auth.js
@@ -72,7 +72,7 @@ router.all('/login/:strategy/callback', async (req, res, next) => {
     }, { req, res })
     res.cookie('jwt', authResult.jwt, commonHelper.getCookieOpts())
 
-    const loginRedirect = req.cookies['loginRedirect']
+    const loginRedirect = req.cookies['loginRedirect'] ?? decodeURI(req.body.RelayState)
     const isValidRedirect = loginRedirect && loginRedirect.startsWith('/') && !loginRedirect.startsWith('//') && !loginRedirect.includes('://')
     if (loginRedirect === '/' && authResult.redirect) {
       res.clearCookie('loginRedirect')