diff --git a/src/Database/Esqueleto/Internal/Sql.hs b/src/Database/Esqueleto/Internal/Sql.hs
index c8f0cf5..afbfaf9 100644
--- a/src/Database/Esqueleto/Internal/Sql.hs
+++ b/src/Database/Esqueleto/Internal/Sql.hs
@@ -222,7 +222,8 @@ uncommas' xs =
 
 
 makeFrom :: Escape -> [FromClause] -> TLB.Builder
-makeFrom esc = uncommas . map mk
+makeFrom _   [] = mempty
+makeFrom esc fs = "\nFROM " <> uncommas (map mk fs)
   where
     mk (From (I i) def) = esc (entityDB def) <> (" AS " <> i)