diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js
index 37ce00ecfc..3a0e9d2d57 100644
--- a/public/src/modules/composer.js
+++ b/public/src/modules/composer.js
@@ -465,7 +465,7 @@ define('composer', [
 			thumbEl.val(thumbEl.val().trim());
 		}
 
-		var checkTitle = parseInt(postData.cid, 10) || parseInt(postData.pid, 10);
+		var checkTitle = (parseInt(postData.cid, 10) || parseInt(postData.pid, 10)) && postContainer.find('input.title').length;
 
 		if (uploads.inProgress[post_uuid] && uploads.inProgress[post_uuid].length) {
 			return composerAlert(post_uuid, '[[error:still-uploading]]');
diff --git a/src/postTools.js b/src/postTools.js
index cb3b1da938..41f0a4b6ed 100644
--- a/src/postTools.js
+++ b/src/postTools.js
@@ -89,10 +89,14 @@ var cache = LRU({
 							tid: tid,
 							cid: results.cid,
 							uid: postData.uid,
-							mainPid: data.pid,
-							title: title,
-							slug: tid + '/' + utils.slugify(title)
+							mainPid: data.pid
 						};
+
+						if (title) {
+							topicData.title = title;
+							topicData.slug = tid + '/' + utils.slugify(title);
+						}
+
 						if (options.topic_thumb) {
 							topicData.thumb = options.topic_thumb;
 						}