diff --git a/src/honeysql/format.cljc b/src/honeysql/format.cljc
index f03801b..b9fb16f 100644
--- a/src/honeysql/format.cljc
+++ b/src/honeysql/format.cljc
@@ -97,7 +97,7 @@
         s (cond
             (or (keyword? x) (symbol? x))
             (name-transform-fn
-              (cond *namespace-as-table?*
+              (cond (and *namespace-as-table?* (not= :from *clause*))
                     (str (when-let [n (namespace x)]
                            (str n "."))
                          (name x))