diff --git a/frontend/pages/policies/PolicyPage/components/QueryResults/QueryResults.tsx b/frontend/pages/policies/PolicyPage/components/QueryResults/QueryResults.tsx
index 73a6a3b4bd..97320161de 100644
--- a/frontend/pages/policies/PolicyPage/components/QueryResults/QueryResults.tsx
+++ b/frontend/pages/policies/PolicyPage/components/QueryResults/QueryResults.tsx
@@ -66,11 +66,11 @@ const QueryResults = ({
 
   useEffect(() => {
     const calculatePercent =
-      Math.round(
-        ((totalRowsCount + errors?.length) / targetsTotalCount) * 100
-      ) || 0;
+      targetsTotalCount !== 0
+        ? Math.round((campaign.hosts_count.total / targetsTotalCount) * 100)
+        : 0;
     setTargetsRespondedPercent(calculatePercent);
-  }, [totalRowsCount, errors]);
+  }, [campaign]);
 
   useEffect(() => {
     if (isQueryFinished) {
diff --git a/frontend/pages/queries/QueryPage/components/QueryResults/QueryResults.tsx b/frontend/pages/queries/QueryPage/components/QueryResults/QueryResults.tsx
index 29d11b87fb..1989f3dc6d 100644
--- a/frontend/pages/queries/QueryPage/components/QueryResults/QueryResults.tsx
+++ b/frontend/pages/queries/QueryPage/components/QueryResults/QueryResults.tsx
@@ -63,11 +63,11 @@ const QueryResults = ({
 
   useEffect(() => {
     const calculatePercent =
-      Math.round(
-        ((totalRowsCount + errors?.length) / targetsTotalCount) * 100
-      ) || 0;
+      targetsTotalCount !== 0
+        ? Math.round((campaign.hosts_count.total / targetsTotalCount) * 100)
+        : 0;
     setTargetsRespondedPercent(calculatePercent);
-  }, [totalRowsCount, errors]);
+  }, [campaign]);
 
   useEffect(() => {
     if (isQueryFinished) {