diff --git a/artiq/master/worker_impl.py b/artiq/master/worker_impl.py
index 164bf7cc4..769bcb17c 100644
--- a/artiq/master/worker_impl.py
+++ b/artiq/master/worker_impl.py
@@ -257,9 +257,9 @@ def main():
             if exc_str:
                 short_exc_info += ": " + exc_str
             lines = ["Terminating with exception ("+short_exc_info+")\n"]
-            lines += traceback.format_exception_only(type(exc), exc)
             if hasattr(exc, "parent_traceback"):
                 lines += exc.parent_traceback
+                lines += traceback.format_exception_only(type(exc), exc)
             logging.error("".join(lines).rstrip(),
                           exc_info=not hasattr(exc, "parent_traceback"))
         put_object({"action": "exception"})