diff --git a/src/containers/Chat/ChatMessages/StartFlow/StartFlow.tsx b/src/containers/Chat/ChatMessages/StartFlow/StartFlow.tsx
index 678b9b6f0..c64921801 100644
--- a/src/containers/Chat/ChatMessages/StartFlow/StartFlow.tsx
+++ b/src/containers/Chat/ChatMessages/StartFlow/StartFlow.tsx
@@ -31,6 +31,7 @@ export const StartAFlow = ({
     variables: setVariables({
       status: FLOW_STATUS_PUBLISHED,
       isActive: true,
+      isTemplate: false,
     }),
     fetchPolicy: 'network-only', // set for now, need to check cache issue
   });
diff --git a/src/containers/SettingList/OrganizationFlows/OrganizationFlows.tsx b/src/containers/SettingList/OrganizationFlows/OrganizationFlows.tsx
index 274bd9145..7ecfed8b5 100644
--- a/src/containers/SettingList/OrganizationFlows/OrganizationFlows.tsx
+++ b/src/containers/SettingList/OrganizationFlows/OrganizationFlows.tsx
@@ -82,6 +82,7 @@ export const OrganizationFlows = () => {
   const { data: flow } = useQuery(GET_FLOWS, {
     variables: setVariables({
       status: FLOW_STATUS_PUBLISHED,
+      isTemplate: false,
     }),
     fetchPolicy: 'network-only', // set for now, need to check cache issue
   });
diff --git a/src/containers/SettingList/SettingList.test.helper.ts b/src/containers/SettingList/SettingList.test.helper.ts
index 77f066568..175e20327 100644
--- a/src/containers/SettingList/SettingList.test.helper.ts
+++ b/src/containers/SettingList/SettingList.test.helper.ts
@@ -36,7 +36,7 @@ const languageMock = {
 const flowsMock = {
   request: {
     query: GET_FLOWS,
-    variables: setVariables({ status: FLOW_STATUS_PUBLISHED }),
+    variables: setVariables({ status: FLOW_STATUS_PUBLISHED, isTemplate: false }),
   },
   result: {
     data: {
diff --git a/src/containers/Trigger/Trigger.tsx b/src/containers/Trigger/Trigger.tsx
index 0bceb3e98..67dc2f599 100644
--- a/src/containers/Trigger/Trigger.tsx
+++ b/src/containers/Trigger/Trigger.tsx
@@ -249,6 +249,7 @@ export const Trigger = () => {
   const { data: flow } = useQuery(GET_FLOWS, {
     variables: setVariables({
       status: FLOW_STATUS_PUBLISHED,
+      isTemplate: false,
     }),
     fetchPolicy: 'network-only', // set for now, need to check cache issue
   });
diff --git a/src/mocks/Flow.tsx b/src/mocks/Flow.tsx
index ef4a0077f..d302c24a9 100644
--- a/src/mocks/Flow.tsx
+++ b/src/mocks/Flow.tsx
@@ -329,7 +329,7 @@ export const getPublishedFlowQuery = {
   request: {
     query: GET_FLOWS,
     variables: {
-      filter: { status: 'published', isActive: true },
+      filter: { status: 'published', isActive: true, isTemplate: false },
       opts: {
         order: 'ASC',
         limit: null,