From dbddf06ff51d278f037cd0c345574860c171fe71 Mon Sep 17 00:00:00 2001
From: jessopb <36554050+jessopb@users.noreply.github.com>
Date: Fri, 14 Dec 2018 17:10:12 -0500
Subject: [PATCH] Revert "Sets proper 404 status in most cases"

---
 server/render/src/handleShowRender.jsx | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/server/render/src/handleShowRender.jsx b/server/render/src/handleShowRender.jsx
index b306ae5f..6e527b0c 100644
--- a/server/render/src/handleShowRender.jsx
+++ b/server/render/src/handleShowRender.jsx
@@ -20,11 +20,11 @@ const createCanonicalLink = require('../../../utils/createCanonicalLink');
 const getCanonicalUrlFromShow = show => {
   const requestId = show.requestList[show.request.id];
   const requestType = show.request.type;
-
+  
   if (!requestId || !requestType) {
     return null;
   }
-
+  
   switch (requestType) {
     case 'ASSET_DETAILS':
       const asset = show.assetList[requestId.key];
@@ -57,15 +57,16 @@ module.exports = (req, res) => {
     // Workaround, remove when a solution for async httpContext exists
     const showState = store.getState().show;
     const assetKeys = Object.keys(showState.assetList);
-    const channelKeys = Object.keys(showState.channelList);
-
-    if (assetKeys.length !== 0) {
+    
+    if(assetKeys.length !== 0) {
       res.claimId = showState.assetList[assetKeys[0]].claimId;
-    } else if (channelKeys.length !== 0) {
-      res.claimId = showState.channelList[channelKeys[0]].longId;
-      res.isChannel = true;
     } else {
-      res.status(404);
+      const channelKeys = Object.keys(showState.channelList);
+
+      if(channelKeys.length !== 0) {
+        res.claimId = showState.channelList[channelKeys[0]].longId;
+        res.isChannel = true;
+        }
     }
 
     // render component to a string
-- 
2.45.2