diff --git a/portal-impl/src/com/liferay/portlet/wiki/action/RSSAction.java b/portal-impl/src/com/liferay/portlet/wiki/action/RSSAction.java
index 21bf7a22c8de59da44d13cdf50c9574b4192e594..48a32826e4a20da9cc2118dfc9bb7b947c0e6faa 100644
--- a/portal-impl/src/com/liferay/portlet/wiki/action/RSSAction.java
+++ b/portal-impl/src/com/liferay/portlet/wiki/action/RSSAction.java
@@ -15,10 +15,12 @@
 package com.liferay.portlet.wiki.action;
 
 import com.liferay.portal.kernel.dao.search.SearchContainer;
+import com.liferay.portal.kernel.util.GetterUtil;
 import com.liferay.portal.kernel.util.ParamUtil;
 import com.liferay.portal.kernel.util.StringBundler;
 import com.liferay.portal.kernel.util.StringPool;
 import com.liferay.portal.kernel.util.Validator;
+import com.liferay.portal.service.PortletPreferencesLocalServiceUtil;
 import com.liferay.portal.theme.ThemeDisplay;
 import com.liferay.portal.util.Portal;
 import com.liferay.portal.util.PortalUtil;
@@ -30,6 +32,8 @@ import com.liferay.util.RSSUtil;
 
 import java.util.Locale;
 
+import javax.portlet.PortletPreferences;
+
 import javax.servlet.http.HttpServletRequest;
 
 /**
@@ -92,4 +96,28 @@ public class RSSAction extends com.liferay.portal.struts.RSSAction {
 		return rss.getBytes(StringPool.UTF8);
 	}
 
+	protected boolean isRSSFeedsEnabled(HttpServletRequest request)
+		throws Exception {
+
+		if (!super.isRSSFeedsEnabled(request)) {
+			return false;
+		}
+
+		ThemeDisplay themeDisplay = (ThemeDisplay)request.getAttribute(
+			WebKeys.THEME_DISPLAY);
+
+		PortletPreferences portletPreferences =
+			PortletPreferencesLocalServiceUtil.getPreferences(
+				themeDisplay.getCompanyId(), PortletKeys.PREFS_OWNER_ID_DEFAULT,
+				PortletKeys.PREFS_OWNER_TYPE_LAYOUT, themeDisplay.getPlid(),
+				PortletKeys.WIKI, null);
+
+		if (portletPreferences != null) {
+			return GetterUtil.getBoolean(
+				portletPreferences.getValue("enableRss", null), true);
+		}
+
+		return true;
+	}
+
 }
\ No newline at end of file
