diff --git a/server/middlewares/add-return-to.js b/server/middlewares/add-return-to.js
index 59163d42da..6771c38481 100644
--- a/server/middlewares/add-return-to.js
+++ b/server/middlewares/add-return-to.js
@@ -26,13 +26,12 @@ export default function addReturnToUrl() {
   return function(req, res, next) {
     // Remember original destination before login.
     var path = req.path.split('/')[1];
-    var subPath = req.path.split('/')[2];
 
     if (
       req.method !== 'GET' ||
       pathsOfNoReturnRegex.test(path) ||
       !whiteListRegex.test(path) ||
-      (/news/i).test(path) && (/hot/i).test(subPath)
+      (/news/i).test(path) && (/hot/i).test(req.path)
     ) {
       return next();
     }