diff --git a/include/class.export.php b/include/class.export.php
index a45699d3a8f498949e49456f790a766360aa52fb..1e92c97f6d55522c2384f1837412cae44cbb07ec 100644
--- a/include/class.export.php
+++ b/include/class.export.php
@@ -56,7 +56,14 @@ class Export {
             $fields[$key] = $f;
             $cdata[$key] = $f->getLocal('label');
         }
-        return self::dumpQuery($sql,
+        // Reset the $sql query
+        $tickets = TicketModel::objects()
+            ->filter($sql->constraints)
+            ->select_related('user', 'user__default_email', 'dept', 'staff',
+                'team', 'staff', 'cdata');
+        call_user_func_array(array($tickets, 'order_by'), $sql->getSortFields());
+
+        return self::dumpQuery($tickets,
             array(
                 'number' =>         __('Ticket Number'),
                 'created' =>        __('Date'),