diff --git a/db/Template.go b/db/Template.go
index 059ca24db..33a1adf46 100644
--- a/db/Template.go
+++ b/db/Template.go
@@ -123,6 +123,15 @@ func FillTemplate(d Store, template *Template) (err error) {
 	if err != nil {
 		return
 	}
+	
+	var tasks []TaskWithTpl
+	tasks, err = d.GetTemplateTasks(template.ProjectID, template.ID, RetrieveQueryParams{Count: 1})
+	if err != nil {
+		return
+	}
+	if len(tasks) > 0 {
+		template.LastTask = &tasks[0]
+	}
 
 	if template.SurveyVarsJSON != nil {
 		err = json.Unmarshal([]byte(*template.SurveyVarsJSON), &template.SurveyVars)