diff --git a/app/reducers/views/channel.js b/app/reducers/views/channel.js
index 14430b7b8..b4edd8e4f 100644
--- a/app/reducers/views/channel.js
+++ b/app/reducers/views/channel.js
@@ -62,7 +62,7 @@ function handleSetTempUploadFileForPostDraft(state, action) {
 
     const tempFiles = action.clientIds.map((temp) => ({...temp, loading: true}));
     const files = [
-        ...state[action.channelId].files,
+        ...state[action.channelId]?.files || [],
         ...tempFiles,
     ];
 
diff --git a/app/reducers/views/thread.js b/app/reducers/views/thread.js
index 952c72171..6e51c4d3e 100644
--- a/app/reducers/views/thread.js
+++ b/app/reducers/views/thread.js
@@ -73,7 +73,7 @@ function handleSetTempUploadFilesForPostDraft(state, action) {
 
     const tempFiles = action.clientIds.map((temp) => ({...temp, loading: true}));
     const files = [
-        ...state[action.rootId].files,
+        ...state[action.rootId]?.files || [],
         ...tempFiles,
     ];