diff --git a/src/webapp/components/template-selector/TemplateSelector.tsx b/src/webapp/components/template-selector/TemplateSelector.tsx
index 9fc4a918..ecc755dd 100644
--- a/src/webapp/components/template-selector/TemplateSelector.tsx
+++ b/src/webapp/components/template-selector/TemplateSelector.tsx
@@ -77,7 +77,7 @@ export const TemplateSelector = ({
         {
             startDate: moment().add("-1", "year").startOf("year"),
             endDate: moment().add("-1", "year").endOf("year"),
-            relationshipsOuFilter: "SELECTED",
+            relationshipsOuFilter: settings.orgUnitSelection === "import" ? "CAPTURE" : "SELECTED",
             populate: false,
             downloadRelationships: true,
             filterTEIEnrollmentDate: false,
diff --git a/src/webapp/pages/download-template/DownloadTemplatePage.tsx b/src/webapp/pages/download-template/DownloadTemplatePage.tsx
index f983004f..ec629730 100644
--- a/src/webapp/pages/download-template/DownloadTemplatePage.tsx
+++ b/src/webapp/pages/download-template/DownloadTemplatePage.tsx
@@ -30,6 +30,8 @@ export default function DownloadTemplatePage({ settings, themes, customTemplates
             template;
 
         if (
+            type === "trackerPrograms" &&
+            populate &&
             (template.relationshipsOuFilter === "SELECTED" ||
                 template.relationshipsOuFilter === "CHILDREN" ||
                 template.relationshipsOuFilter === "DESCENDANTS") &&