diff --git a/syntax/do.php b/syntax/do.php
index 2f3530f..28f1d6d 100644
--- a/syntax/do.php
+++ b/syntax/do.php
@@ -159,6 +159,10 @@ public function render($mode, Doku_Renderer $R, $data) {
         // we don't care for QC FIXME we probably should ignore even more renderers
         if($mode == 'qc') return false;
 
+        if($mode === 'metadata') {
+            return true;
+        }
+
         // augment current task with original creator info and old assignees
         $oldtask = $this->_oldTask($ID, $data['task']['md5']);
         if($oldtask) {
@@ -167,10 +171,9 @@ public function render($mode, Doku_Renderer $R, $data) {
             $data['task']['status'] = $oldtask['status'];
         }
 
-        // save data to sqlite during meta data run
-        if($mode === 'metadata') {
+        // save data to sqlite during xhtml run
+        if($mode === 'xhtml') {
             $this->_save($data);
-            return true;
         }
 
         // show simple task with status icon for export renderers