diff --git a/apps/backend/src/datasources/mockups/QuestionaryDataSource.ts b/apps/backend/src/datasources/mockups/QuestionaryDataSource.ts
index 5bfd4895d3..53ef8bae35 100644
--- a/apps/backend/src/datasources/mockups/QuestionaryDataSource.ts
+++ b/apps/backend/src/datasources/mockups/QuestionaryDataSource.ts
@@ -1,3 +1,4 @@
+import { DeepPartial } from './ProposalDataSource';
 import {
   DependenciesLogicOperator,
   EvaluatorOperator,
@@ -29,7 +30,6 @@ import {
   TextInputConfig,
 } from '../../resolvers/types/FieldConfig';
 import { QuestionaryDataSource } from '../QuestionaryDataSource';
-import { DeepPartial } from './ProposalDataSource';
 
 export let dummyQuestionarySteps: QuestionaryStep[];
 export let dummyQuestionary: Questionary;
@@ -74,6 +74,7 @@ export const dummyQuestionTemplateRelationFactory = (
     dummyQuestionFactory(values?.question),
     values?.sortOrder || Math.round(Math.random() * 100),
     values?.topicId || Math.round(Math.random() * 10),
+    values?.templateId || Math.round(Math.random() * 100),
     values?.config || { ...new BooleanConfig(), readPermissions: [] },
     values?.dependencies as FieldDependency[],
     values?.dependenciesOperator as DependenciesLogicOperator
diff --git a/apps/backend/src/datasources/postgres/records.ts b/apps/backend/src/datasources/postgres/records.ts
index e7be025f9d..b14d371ac4 100644
--- a/apps/backend/src/datasources/postgres/records.ts
+++ b/apps/backend/src/datasources/postgres/records.ts
@@ -931,6 +931,7 @@ export const createQuestionTemplateRelationObject = async <T extends DataType>(
     ),
     record.topic_id,
     record.sort_order,
+    record.template_id,
     createConfig<any>(record.data_type as DataType, transformedConfig),
     dependencies,
     record.dependencies_operator
diff --git a/apps/backend/src/models/Questionary.ts b/apps/backend/src/models/Questionary.ts
index 6a8130a5ce..620ee1a1f3 100644
--- a/apps/backend/src/models/Questionary.ts
+++ b/apps/backend/src/models/Questionary.ts
@@ -20,6 +20,7 @@ export class Answer extends QuestionTemplateRelation {
       questionTemplateRelation.question,
       questionTemplateRelation.topicId,
       questionTemplateRelation.sortOrder,
+      questionTemplateRelation.templateId,
       questionTemplateRelation.config,
       questionTemplateRelation.dependencies,
       questionTemplateRelation.dependenciesOperator
diff --git a/apps/backend/src/models/Template.ts b/apps/backend/src/models/Template.ts
index 4127fb0742..ead41414ba 100644
--- a/apps/backend/src/models/Template.ts
+++ b/apps/backend/src/models/Template.ts
@@ -80,6 +80,7 @@ export class QuestionTemplateRelation {
     public question: Question,
     public topicId: number,
     public sortOrder: number,
+    public templateId: number,
     public config: typeof FieldConfigType,
     public dependencies: FieldDependency[],
     public dependenciesOperator?: DependenciesLogicOperator
diff --git a/apps/backend/src/resolvers/types/QuestionTemplateRelation.ts b/apps/backend/src/resolvers/types/QuestionTemplateRelation.ts
index 4b4945a151..46cc2b24ad 100644
--- a/apps/backend/src/resolvers/types/QuestionTemplateRelation.ts
+++ b/apps/backend/src/resolvers/types/QuestionTemplateRelation.ts
@@ -16,6 +16,9 @@ export class QuestionTemplateRelation
   @Field(() => Int)
   public sortOrder: number;
 
+  @Field(() => Int)
+  public templateId: number;
+
   @Field(() => Int)
   public topicId: number;
 
diff --git a/apps/frontend/src/components/common/proposalFilters/QuestionaryFilter.tsx b/apps/frontend/src/components/common/proposalFilters/QuestionaryFilter.tsx
index 80613096e7..5ba47236b5 100644
--- a/apps/frontend/src/components/common/proposalFilters/QuestionaryFilter.tsx
+++ b/apps/frontend/src/components/common/proposalFilters/QuestionaryFilter.tsx
@@ -63,11 +63,7 @@ const extractSearchableQuestions = (
     ); // only searchable questions
 };
 
-function QuestionaryFilter({
-  onSubmit,
-  callId,
-  templateId,
-}: QuestionaryFilterProps) {
+function QuestionaryFilter({ onSubmit, callId }: QuestionaryFilterProps) {
   const { loading: isLoadingQuestionarySteps, questionarySteps } =
     useBlankQuestionaryStepsDataByCallId(callId);
 
@@ -163,7 +159,7 @@ function QuestionaryFilter({
               }}
               questionTemplateRelation={selectedQuestion}
               callId={callId}
-              templateId={templateId}
+              templateId={selectedQuestion.templateId}
             />
           )}
         </Collapse>
diff --git a/apps/frontend/src/graphql/questionary/fragment.answer.graphql b/apps/frontend/src/graphql/questionary/fragment.answer.graphql
index 7f43811a41..21b274f99f 100644
--- a/apps/frontend/src/graphql/questionary/fragment.answer.graphql
+++ b/apps/frontend/src/graphql/questionary/fragment.answer.graphql
@@ -4,6 +4,7 @@ fragment answer on Answer {
     ...question
   }
   sortOrder
+  templateId
   topicId
   config {
     ...fieldConfig
diff --git a/apps/frontend/src/graphql/template/fragment.questionRel.graphql b/apps/frontend/src/graphql/template/fragment.questionRel.graphql
index 60299dba78..21436fd9ba 100644
--- a/apps/frontend/src/graphql/template/fragment.questionRel.graphql
+++ b/apps/frontend/src/graphql/template/fragment.questionRel.graphql
@@ -3,6 +3,7 @@ fragment questionTemplateRelation on QuestionTemplateRelation {
     ...question
   }
   sortOrder
+  templateId
   topicId
   config {
     ...fieldConfig