diff --git a/portal-web/docroot/html/portlet/wiki/page_activity_page_action.jsp b/portal-web/docroot/html/portlet/wiki/page_activity_page_action.jsp
index 68c2c656fd3f952d6e7a24ce0966e49ee0b96281..db63b8265306d28ebcf58fe6b30a88fd41dea21c 100644
--- a/portal-web/docroot/html/portlet/wiki/page_activity_page_action.jsp
+++ b/portal-web/docroot/html/portlet/wiki/page_activity_page_action.jsp
@@ -27,47 +27,49 @@ double version = extraDataJSONObject.getDouble("version");
 
 WikiPage wikiPage = (WikiPage)request.getAttribute(WebKeys.WIKI_PAGE);
 
-WikiPage socialActivityPage = WikiPageLocalServiceUtil.getPage(wikiPage.getNodeId(), wikiPage.getTitle(), version);
+WikiPage socialActivityWikiPage = WikiPageLocalServiceUtil.fetchPage(wikiPage.getNodeId(), wikiPage.getTitle(), version);
 %>
 
-<liferay-ui:icon-menu>
-	<c:if test="<%= (version != wikiPage.getVersion()) && (socialActivityPage.isApproved()) && (WikiPagePermission.contains(permissionChecker, wikiPage, ActionKeys.UPDATE)) %>">
-		<portlet:actionURL var="revertURL">
-			<portlet:param name="struts_action" value="/wiki/edit_page" />
-			<portlet:param name="<%= Constants.CMD %>" value="<%= Constants.REVERT %>" />
+<c:if test="<%= socialActivityWikiPage != null %>">
+	<liferay-ui:icon-menu>
+		<c:if test="<%= (version != wikiPage.getVersion()) && (socialActivityWikiPage.isApproved()) && (WikiPagePermission.contains(permissionChecker, wikiPage, ActionKeys.UPDATE)) %>">
+			<portlet:actionURL var="revertURL">
+				<portlet:param name="struts_action" value="/wiki/edit_page" />
+				<portlet:param name="<%= Constants.CMD %>" value="<%= Constants.REVERT %>" />
+				<portlet:param name="redirect" value="<%= currentURL %>" />
+				<portlet:param name="nodeId" value="<%= String.valueOf(wikiPage.getNodeId()) %>" />
+				<portlet:param name="title" value="<%= HtmlUtil.unescape(wikiPage.getTitle()) %>" />
+				<portlet:param name="version" value="<%= String.valueOf(version) %>" />
+			</portlet:actionURL>
+
+			<liferay-ui:icon
+				image="undo"
+				message='<%= LanguageUtil.get(pageContext, "restore-version") + " " + String.valueOf(version) %>'
+				url="<%= revertURL %>"
+			/>
+		</c:if>
+
+		<portlet:renderURL var="compareVersionsURL" windowState="<%= LiferayWindowState.POP_UP.toString() %>">
+			<portlet:param name="struts_action" value="/wiki/select_version" />
 			<portlet:param name="redirect" value="<%= currentURL %>" />
 			<portlet:param name="nodeId" value="<%= String.valueOf(wikiPage.getNodeId()) %>" />
 			<portlet:param name="title" value="<%= HtmlUtil.unescape(wikiPage.getTitle()) %>" />
-			<portlet:param name="version" value="<%= String.valueOf(version) %>" />
-		</portlet:actionURL>
-
-		<liferay-ui:icon
-			image="undo"
-			message='<%= LanguageUtil.get(pageContext, "restore-version") + " " + String.valueOf(version) %>'
-			url="<%= revertURL %>"
-		/>
-	</c:if>
-
-	<portlet:renderURL var="compareVersionsURL" windowState="<%= LiferayWindowState.POP_UP.toString() %>">
-		<portlet:param name="struts_action" value="/wiki/select_version" />
-		<portlet:param name="redirect" value="<%= currentURL %>" />
-		<portlet:param name="nodeId" value="<%= String.valueOf(wikiPage.getNodeId()) %>" />
-		<portlet:param name="title" value="<%= HtmlUtil.unescape(wikiPage.getTitle()) %>" />
-		<portlet:param name="sourceVersion" value="<%= String.valueOf(version) %>" />
-	</portlet:renderURL>
+			<portlet:param name="sourceVersion" value="<%= String.valueOf(version) %>" />
+		</portlet:renderURL>
 
-	<%
-	Map<String, Object> data = new HashMap<String, Object>();
+		<%
+		Map<String, Object> data = new HashMap<String, Object>();
 
-	data.put("uri", compareVersionsURL);
-	%>
+		data.put("uri", compareVersionsURL);
+		%>
 
-	<liferay-ui:icon
-		cssClass="compare-to-link"
-		data="<%= data %>"
-		image="copy"
-		label="<%= true %>"
-		message="compare-to"
-		url="javascript:;"
-	/>
-</liferay-ui:icon-menu>
\ No newline at end of file
+		<liferay-ui:icon
+			cssClass="compare-to-link"
+			data="<%= data %>"
+			image="copy"
+			label="<%= true %>"
+			message="compare-to"
+			url="javascript:;"
+		/>
+	</liferay-ui:icon-menu>
+</c:if>
