diff --git a/modules/apps/fragment/fragment-service/src/main/resources/META-INF/custom-sql/default.xml b/modules/apps/fragment/fragment-service/src/main/resources/META-INF/custom-sql/default.xml
index 60fd259174f571..e8167201c08a3b 100644
--- a/modules/apps/fragment/fragment-service/src/main/resources/META-INF/custom-sql/default.xml
+++ b/modules/apps/fragment/fragment-service/src/main/resources/META-INF/custom-sql/default.xml
@@ -15,7 +15,7 @@
 	<sql id="com.liferay.fragment.service.persistence.FragmentEntryLinkFinder.countByG_F_C">
 		<![CDATA[
 			SELECT
-				COUNT(DISTINCT Layout.plid) AS COUNT_VALUE
+				COUNT(DISTINCT FragmentEntryLink.classPK) AS COUNT_VALUE
 			FROM
 				FragmentEntryLink
 			INNER JOIN
@@ -31,7 +31,7 @@
 	<sql id="com.liferay.fragment.service.persistence.FragmentEntryLinkFinder.countByG_F_C_L">
 		<![CDATA[
 			SELECT
-				COUNT(DISTINCT LayoutPageTemplateEntry.layoutPageTemplateEntryId) AS COUNT_VALUE
+				COUNT(DISTINCT FragmentEntryLink.classPK) AS COUNT_VALUE
 			FROM
 				FragmentEntryLink
 			INNER JOIN