diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js
index 8b34f063fe..b6c3715dd4 100644
--- a/public/src/modules/composer.js
+++ b/public/src/modules/composer.js
@@ -152,7 +152,7 @@ define(['taskbar'], function(taskbar) {
 						pid: threadData.pid,
 						title: threadData.title || '',
 						body: threadData.body || '',
-						images: threadData.uploadedImages
+						images: threadData.uploadedImages || []
 					};
 					composer.load(uuid);
 				} else {