diff --git a/src/de/danoeh/antennapod/service/download/DownloadService.java b/src/de/danoeh/antennapod/service/download/DownloadService.java
index 6889acf74..c52266728 100644
--- a/src/de/danoeh/antennapod/service/download/DownloadService.java
+++ b/src/de/danoeh/antennapod/service/download/DownloadService.java
@@ -348,6 +348,8 @@ public class DownloadService extends Service {
 								&& reason != DownloadError.ERROR_DOWNLOAD_CANCELLED) {
 							Log.e(TAG, "Download failed");
 						}
+						download.setFile_url(null);
+						download.setDownloaded(false);
 						saveDownloadStatus(status);
 						sendDownloadHandledIntent(getDownloadType(download));
 
diff --git a/src/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java b/src/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java
index d88902c6f..5de484922 100644
--- a/src/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java
+++ b/src/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java
@@ -29,7 +29,7 @@ public class FeedItemMenuHandler {
 			if (selectedItem.getMedia().isDownloaded()) {
 				menu.findItem(R.id.play_item).setVisible(true);
 				menu.findItem(R.id.remove_item).setVisible(true);
-			} else if (selectedItem.getMedia().getFile_url() == null) {
+			} else {
 				menu.findItem(R.id.download_item).setVisible(true);
 				menu.findItem(R.id.stream_item).setVisible(true);
 			}