diff --git a/portal-impl/src/com/liferay/portal/servlet/filters/i18n/I18nFilter.java b/portal-impl/src/com/liferay/portal/servlet/filters/i18n/I18nFilter.java
index ad2b74b5e97a4b8d55a4845095c25ef9f5dccd10..b65894cd7875e727b09b143407e74f4da7994505 100644
--- a/portal-impl/src/com/liferay/portal/servlet/filters/i18n/I18nFilter.java
+++ b/portal-impl/src/com/liferay/portal/servlet/filters/i18n/I18nFilter.java
@@ -197,9 +197,14 @@ public class I18nFilter extends BasePortalFilter {
 			Group group = layoutSet.getGroup();
 
 			if (groupFriendlyURL.equals(group.getFriendlyURL())) {
-				redirect =
-					contextPath + i18nPath +
-						requestURI.substring(friendlyURLEnd);
+				String layoutURL = requestURI.substring(friendlyURLEnd);
+
+				if (Validator.isNull(layoutURL)) {
+					redirect = contextPath + i18nPath + StringPool.SLASH;
+				}
+				else {
+					redirect = contextPath + i18nPath + layoutURL;
+				}
 			}
 		}