diff --git a/app/dao/templates_dao.py b/app/dao/templates_dao.py
index fe56972c8..fa0c34d45 100644
--- a/app/dao/templates_dao.py
+++ b/app/dao/templates_dao.py
@@ -22,4 +22,8 @@ def dao_get_template_by_id(template_id):
 
 
 def dao_get_all_templates_for_service(service_id):
-    return Template.query.filter_by(service=Service.query.get(service_id)).order_by(asc(Template.created_at)).all()
+    return Template.query.filter_by(
+        service=Service.query.get(service_id)
+    ).order_by(
+        asc(Template.updated_at), asc(Template.created_at)
+    ).all()
diff --git a/tests/app/dao/test_templates_dao.py b/tests/app/dao/test_templates_dao.py
index a3d74afb2..e534271cb 100644
--- a/tests/app/dao/test_templates_dao.py
+++ b/tests/app/dao/test_templates_dao.py
@@ -136,6 +136,10 @@ def test_get_all_templates_for_service_in_created_order(sample_service):
     assert dao_get_all_templates_for_service(sample_service.id)[1].name == 'Sample Template 2'
     assert dao_get_all_templates_for_service(sample_service.id)[2].name == 'Sample Template 3'
 
+    template_2.name = 'Sample Template 2 (updated)'
+    dao_update_template(template_2)
+    assert dao_get_all_templates_for_service(sample_service.id)[0].name == 'Sample Template 2 (updated)'
+
 
 def test_get_all_returns_empty_list_if_no_templates(sample_service):
     assert Template.query.count() == 0