diff --git a/src/metabase/query_processor/middleware/annotate.clj b/src/metabase/query_processor/middleware/annotate.clj
index a6f95d414d3d0455612eb56d6435710d34078cff..08045b280ada43dfcb4fcbf1be065543ae040e23 100644
--- a/src/metabase/query_processor/middleware/annotate.clj
+++ b/src/metabase/query_processor/middleware/annotate.clj
@@ -75,7 +75,7 @@
   "Return an appropriate display name for a joined field that includes the table it came from if applicable."
   [field-display-name {:keys [source-table], join-alias :alias}]
   (let [join-display-name (if (integer? source-table)
-                            (:name (qp.store/table source-table))
+                            (some (qp.store/table source-table) [:display_name :name])
                             join-alias)]
     (format "%s → %s" join-display-name field-display-name)))