diff --git a/ui/component/claimListDiscover/view.jsx b/ui/component/claimListDiscover/view.jsx
index 42a2557da..99dfb6196 100644
--- a/ui/component/claimListDiscover/view.jsx
+++ b/ui/component/claimListDiscover/view.jsx
@@ -72,6 +72,7 @@ type Props = {
   liveLivestreamsFirst?: boolean,
   livestreamMap?: { [string]: any },
   hasSource?: boolean,
+  hasNoSource?: boolean,
   limitClaimsPerChannel?: number,
   releaseTime?: string,
   showNoSourceClaims?: boolean,
@@ -133,6 +134,7 @@ function ClaimListDiscover(props: Props) {
     liveLivestreamsFirst,
     livestreamMap,
     hasSource,
+    hasNoSource,
     isChannel = false,
     showNoSourceClaims,
     empty,
@@ -230,7 +232,7 @@ function ClaimListDiscover(props: Props) {
     page_size: dynamicPageSize,
     page,
     name,
-    claim_type: claimType || undefined,
+    claim_type: claimType || ['stream', 'repost', 'channel'],
     // no_totals makes it so the sdk doesn't have to calculate total number pages for pagination
     // it's faster, but we will need to remove it if we start using total_pages
     no_totals: true,
@@ -244,7 +246,9 @@ function ClaimListDiscover(props: Props) {
         : CS.ORDER_BY_TOP_VALUE, // Sort by top
   };
 
-  if (hasSource || (!ENABLE_NO_SOURCE_CLAIMS && (!claimType || claimType === CS.CLAIM_STREAM))) {
+  if (ENABLE_NO_SOURCE_CLAIMS && hasNoSource) {
+    options.has_no_source = true;
+  } else if (hasSource || (!ENABLE_NO_SOURCE_CLAIMS && (!claimType || claimType === 'stream'))) {
     options.has_source = true;
   }
 
@@ -628,13 +632,20 @@ function ClaimListDiscover(props: Props) {
             liveLivestreamsFirst={liveLivestreamsFirst}
             livestreamMap={livestreamMap}
             searchOptions={options}
-            showNoSourceClaims={showNoSourceClaims}
+            showNoSourceClaims={hasNoSource || showNoSourceClaims}
             empty={empty}
           />
           {loading &&
             new Array(dynamicPageSize)
               .fill(1)
-              .map((x, i) => <ClaimPreview key={i} placeholder="loading" type={type} />)}
+              .map((x, i) => (
+                <ClaimPreview
+                  showNoSourceClaims={hasNoSource || showNoSourceClaims}
+                  key={i}
+                  placeholder="loading"
+                  type={type}
+                />
+              ))}
         </div>
       )}
     </React.Fragment>
diff --git a/ui/component/claimTilesDiscover/view.jsx b/ui/component/claimTilesDiscover/view.jsx
index c915aa275..94f1bf6ac 100644
--- a/ui/component/claimTilesDiscover/view.jsx
+++ b/ui/component/claimTilesDiscover/view.jsx
@@ -188,7 +188,7 @@ function ClaimTilesDiscover(props: Props) {
     has_no_source?: boolean,
   } = {
     page_size: pageSize,
-    claim_type: claimType || undefined,
+    claim_type: claimType || ['stream', 'repost', 'channel'],
     // no_totals makes it so the sdk doesn't have to calculate total number pages for pagination
     // it's faster, but we will need to remove it if we start using total_pages
     no_totals: true,
diff --git a/ui/util/search.js b/ui/util/search.js
index 3839b4d6f..1b70a2e22 100644
--- a/ui/util/search.js
+++ b/ui/util/search.js
@@ -34,6 +34,9 @@ export function getLivestreamOnlyOptions(options: any) {
   delete newOptions.has_source;
   delete newOptions.stream_types;
   newOptions.has_no_source = true;
+  newOptions.claim_type = ['stream'];
+  newOptions.page_size = 50;
+  newOptions.order_by = ['release_time'];
   return newOptions;
 }