diff --git a/src/Model/Item.php b/src/Model/Item.php
index ea5abab45..8c803fff9 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -1330,8 +1330,6 @@ class Item extends BaseObject
 			$item['uri-hash'] = $existing['uri-hash'];
 		}
 
-		self::addLanguageToItemArray($item);
-
 		$item['wall']          = intval(defaults($item, 'wall', 0));
 		$item['extid']         = trim(defaults($item, 'extid', ''));
 		$item['author-name']   = trim(defaults($item, 'author-name', ''));
@@ -1383,6 +1381,8 @@ class Item extends BaseObject
 			return 0;
 		}
 
+		self::addLanguageToItemArray($item);
+
 		// Items cannot be stored before they happen ...
 		if ($item['created'] > DateTimeFormat::utcNow()) {
 			$item['created'] = DateTimeFormat::utcNow();
@@ -2227,9 +2227,6 @@ class Item extends BaseObject
 	 */
 	private static function addLanguageToItemArray(&$item)
 	{
-		// @TODO Find out why body can be empty here
-		$item['body'] = defaults($item, 'body', '');
-
 		$naked_body = BBCode::toPlaintext($item['body'], false);
 
 		$ld = new Text_LanguageDetect();