diff --git a/core/server/apps/private-blogging/lib/middleware.js b/core/server/apps/private-blogging/lib/middleware.js
index cab8713033..5ebf57dca9 100644
--- a/core/server/apps/private-blogging/lib/middleware.js
+++ b/core/server/apps/private-blogging/lib/middleware.js
@@ -22,7 +22,7 @@ function verifySessionHash(salt, hash) {
 }
 
 function getRedirectUrl(query) {
-    const redirect = decodeURIComponent(query ? query.r : '/');
+    const redirect = decodeURIComponent(query.r || '/');
     try {
         return new url.URL(redirect, urlService.utils.urlFor('home', true)).pathname;
     } catch (e) {
diff --git a/core/test/unit/apps/private-blogging/middleware_spec.js b/core/test/unit/apps/private-blogging/middleware_spec.js
index 8629cbcd72..f4e053dfa7 100644
--- a/core/test/unit/apps/private-blogging/middleware_spec.js
+++ b/core/test/unit/apps/private-blogging/middleware_spec.js
@@ -25,7 +25,9 @@ describe('Private Blogging', function () {
         var req, res, next;
 
         beforeEach(function () {
-            req = {};
+            req = {
+                query: {}
+            };
             res = {};
             settingsStub = sandbox.stub(settingsCache, 'get');
             next = sandbox.spy();