diff --git a/lib/parser/atom.ex b/lib/parser/atom.ex
index a734420..f70cc71 100644
--- a/lib/parser/atom.ex
+++ b/lib/parser/atom.ex
@@ -72,7 +72,13 @@ defmodule FeedParser.Parser.Atom do
             _ -> nil
           end
 
-        author = texts('/entry/author/name/text()', entry) || feed_author
+        author =
+          texts('/entry/author/name/text()', entry) ||
+            feed_author
+            |> case do
+              nil -> nil
+              authors -> Enum.join(authors, ", ")
+            end
 
         content = text('/entry/content/text()', entry) || text('/entry/summary/text()', entry)
 
@@ -83,7 +89,7 @@ defmodule FeedParser.Parser.Atom do
           links: links,
           content: content,
           date: updated,
-          creator: author |> Enum.join(", ")
+          creator: author
         }
       end)