diff --git a/mod/data/templates.php b/mod/data/templates.php
index dc912fee37a..4f2d153255d 100755
--- a/mod/data/templates.php
+++ b/mod/data/templates.php
@@ -102,6 +102,10 @@
             // Reset the template to default, but don't save yet.
             $resettemplate = true;
             $data->{$mode} = data_generate_default_template($data, $mode, 0, false, false);
+            if ($mode == 'listtemplate') {
+                $data->listtemplateheader = '';
+                $data->listtemplatefooter = '';
+            }
         } else {
             if (isset($mytemplate->listtemplateheader)){
                 $newtemplate->listtemplateheader = $mytemplate->listtemplateheader;