diff --git a/components/com_users/controllers/user.php b/components/com_users/controllers/user.php
index ac0b4e1301079..593e5a699e605 100644
--- a/components/com_users/controllers/user.php
+++ b/components/com_users/controllers/user.php
@@ -214,6 +214,12 @@ public function logout()
 			}
 		}
 
+		// In case redirect url is not set, redirect user to homepage
+		if (empty($return))
+		{
+			$return = JUri::root();
+		}
+
 		// Redirect the user.
 		$app->redirect(JRoute::_($return, false));
 	}