diff --git a/src/modules/tpm/challengesnew/tpm-md-editor.js b/src/modules/tpm/challengesnew/tpm-md-editor.js
index bb8a8e8d4..26402bcf1 100644
--- a/src/modules/tpm/challengesnew/tpm-md-editor.js
+++ b/src/modules/tpm/challengesnew/tpm-md-editor.js
@@ -123,9 +123,10 @@ export default ({ mdID, onChange, onCMBeforeChange, onCMBlur, error = false, cla
     axios.get(`/v1/${owner}/${projectsId}/issues`,{params:{
       only_name:true,keyword
     }}).then(result=>{
-      if(result && result.data.total_count!== 0){
+      if(result){
         !keyword && setIssues(result.data.issues);
-        setScreenIssues(result.data.issues);
+        let data = result.data.issues;
+        setScreenIssues(data && data.length > 0 ? data:undefined);
       }
     })
   }
@@ -133,7 +134,7 @@ export default ({ mdID, onChange, onCMBeforeChange, onCMBlur, error = false, cla
   const QuoteDiv = (
     <div id="quoteDiv" className="quoteDiv">
       {
-        screenIssues && screenIssues.length>0 && screenIssues.map((i,k)=>{
+        screenIssues && screenIssues.map((i,k)=>{
           return(
             <li className={`quote ${k === 0 && "active"}`} onClick={()=>selectQuoteIssue(i)} onMouseOver={()=>onMouseOverQuote(k)}>
               <span style={{minWidth:"40px"}}><span className="issueIndex" title={i.project_issues_index}>#{i.project_issues_index}</span></span>