diff --git a/.eslintrc.json b/.eslintrc.json
index 4d5958b53..060ae3f8f 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -39,6 +39,7 @@
     "react/jsx-indent": 0,
     "react-hooks/exhaustive-deps": "warn",
     "react-hooks/rules-of-hooks": "error",
+    "react/no-unescaped-entities": 0,
     "space-before-function-paren": [
       "error",
       {
diff --git a/ui/component/claimListDiscover/view.jsx b/ui/component/claimListDiscover/view.jsx
index 44be55196..498f7cd28 100644
--- a/ui/component/claimListDiscover/view.jsx
+++ b/ui/component/claimListDiscover/view.jsx
@@ -133,11 +133,7 @@ function ClaimListDiscover(props: Props) {
         <I18nMessage
           tokens={{
             trending: (
-              <Button
-                button="link"
-                label={__("trending for everyone")}
-                navigate={'/?type=trending&sort=everyone'}
-              />
+              <Button button="link" label={__('trending for everyone')} navigate={'/?type=trending&sort=everyone'} />
             ),
             discover: <Button button="link" label={__('discover some channels!')} navigate={'/$/following'} />,
           }}
@@ -177,7 +173,7 @@ function ClaimListDiscover(props: Props) {
     </div>
   );
 
-  const emptyState = personalSort === SEARCH_SORT_CHANNELS && !hasContent ? noChannels : noResults;
+  const emptyState = !loading && (personalSort === SEARCH_SORT_CHANNELS && !hasContent ? noChannels : noResults);
 
   function getSearch() {
     let search = `?`;