diff --git a/classes/feeditem/atom.php b/classes/feeditem/atom.php
index 9680748f9..fa6b3a34c 100644
--- a/classes/feeditem/atom.php
+++ b/classes/feeditem/atom.php
@@ -58,7 +58,13 @@ class FeedItem_Atom extends FeedItem_Common {
 		if ($content) {
 			if ($content->hasAttribute('type')) {
 				if ($content->getAttribute('type') == 'xhtml') {
-					return $this->doc->saveXML($content->firstChild->nextSibling);
+					for ($i = 0; $i < $content->childNodes->length; $i++) {
+						$child = $content->childNodes->item($i);
+
+						if ($child->hasChildNodes()) {
+							return $this->doc->saveXML($child);
+						}
+					}
 				}
 			}
 
@@ -72,7 +78,13 @@ class FeedItem_Atom extends FeedItem_Common {
 		if ($content) {
 			if ($content->hasAttribute('type')) {
 				if ($content->getAttribute('type') == 'xhtml') {
-					return $this->doc->saveXML($content->firstChild->nextSibling);
+					for ($i = 0; $i < $content->childNodes->length; $i++) {
+						$child = $content->childNodes->item($i);
+
+						if ($child->hasChildNodes()) {
+							return $this->doc->saveXML($child);
+						}
+					}
 				}
 			}