diff --git a/include/class.thread.php b/include/class.thread.php
index b2379b2e723c0cc4dbeb6ea33872bf751cf346a1..c5c1707cd5b2580d93f4c25d7199c941defecace 100644
--- a/include/class.thread.php
+++ b/include/class.thread.php
@@ -869,7 +869,7 @@ Class ThreadEntry {
             .' ,poster='.db_input($poster)
             .' ,source='.db_input($vars['source']);
 
-        if (!isset($vars['attachments']))
+        if (!isset($vars['attachments']) || !$vars['attachments'])
             // Otherwise, body will be configured in a block below (after
             // inline attachments are saved and updated in the database)
             $sql.=' ,body='.db_input($vars['body']);