diff --git a/app/src/main/java/de/danoeh/antennapod/actionbutton/ItemActionButton.java b/app/src/main/java/de/danoeh/antennapod/actionbutton/ItemActionButton.java
index 54714be3d..84b246167 100644
--- a/app/src/main/java/de/danoeh/antennapod/actionbutton/ItemActionButton.java
+++ b/app/src/main/java/de/danoeh/antennapod/actionbutton/ItemActionButton.java
@@ -7,7 +7,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.StringRes;
 import android.view.View;
 
-import de.danoeh.antennapod.model.feed.Feed;
 import de.danoeh.antennapod.playback.service.PlaybackStatus;
 import de.danoeh.antennapod.model.feed.FeedItem;
 import de.danoeh.antennapod.model.feed.FeedMedia;
@@ -49,8 +48,6 @@ public abstract class ItemActionButton {
             return new PlayActionButton(item);
         } else if (isDownloadingMedia) {
             return new CancelDownloadActionButton(item);
-        } else if (item.getFeed().getState() != Feed.STATE_SUBSCRIBED) {
-            return new StreamActionButton(item);
         } else if (UserPreferences.isStreamOverDownload()) {
             return new StreamActionButton(item);
         } else {
diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/FeedItemlistFragment.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/FeedItemlistFragment.java
index f9c41496f..e4e64ffc5 100644
--- a/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/FeedItemlistFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/FeedItemlistFragment.java
@@ -696,6 +696,9 @@ public class FeedItemlistFragment extends Fragment implements AdapterView.OnItem
                     .withPlaceholderView(holder.placeholder)
                     .withCoverView(holder.cover)
                     .load();
+            if (feed.getState() != Feed.STATE_SUBSCRIBED) {
+                holder.secondaryActionButton.setVisibility(View.GONE);
+            }
         }
 
         @Override