diff --git a/app/src/main/java/io/lbry/browser/adapter/ClaimListAdapter.java b/app/src/main/java/io/lbry/browser/adapter/ClaimListAdapter.java
index 74f9df1b..05f6eb90 100644
--- a/app/src/main/java/io/lbry/browser/adapter/ClaimListAdapter.java
+++ b/app/src/main/java/io/lbry/browser/adapter/ClaimListAdapter.java
@@ -308,7 +308,8 @@ public class ClaimListAdapter extends RecyclerView.Adapter<ClaimListAdapter.View
 
         Claim original = items.get(position);
         boolean isRepost = Claim.TYPE_REPOST.equalsIgnoreCase(original.getValueType());
-        final Claim item = Claim.TYPE_REPOST.equalsIgnoreCase(original.getValueType()) ? original.getRepostedClaim() : original;
+        final Claim item = Claim.TYPE_REPOST.equalsIgnoreCase(original.getValueType()) ?
+                (original.getRepostedClaim() != null ? original.getRepostedClaim() : original): original;
         Claim.GenericMetadata metadata = item.getValue();
         Claim signingChannel = item.getSigningChannel();
         Claim.StreamMetadata streamMetadata = null;
@@ -383,7 +384,7 @@ public class ClaimListAdapter extends RecyclerView.Adapter<ClaimListAdapter.View
 
         vh.publishTimeView.setVisibility(!isPending ? View.VISIBLE : View.GONE);
         vh.pendingTextView.setVisibility(isPending ? View.VISIBLE : View.GONE);
-        vh.repostInfoView.setVisibility(isRepost ? View.VISIBLE : View.GONE);
+        vh.repostInfoView.setVisibility(isRepost && type != VIEW_TYPE_FEATURED ? View.VISIBLE : View.GONE);
         vh.repostChannelView.setText(isRepost ? original.getSigningChannel().getName() : null);
         vh.repostChannelView.setOnClickListener(new View.OnClickListener() {
             @Override
diff --git a/app/src/main/java/io/lbry/browser/ui/findcontent/SearchFragment.java b/app/src/main/java/io/lbry/browser/ui/findcontent/SearchFragment.java
index 612cbace..c514ae8d 100644
--- a/app/src/main/java/io/lbry/browser/ui/findcontent/SearchFragment.java
+++ b/app/src/main/java/io/lbry/browser/ui/findcontent/SearchFragment.java
@@ -201,6 +201,7 @@ public class SearchFragment extends BaseFragment implements
                 unresolved.setPermanentUrl(resolved.getPermanentUrl());
                 unresolved.setValue(resolved.getValue());
                 unresolved.setSigningChannel(resolved.getSigningChannel());
+                unresolved.setRepostedClaim(resolved.getRepostedClaim());
                 unresolved.setUnresolved(false);
                 unresolved.setConfirmations(resolved.getConfirmations());
             }