diff --git a/src/de/danoeh/antennapod/service/PlaybackService.java b/src/de/danoeh/antennapod/service/PlaybackService.java
index 12c005765..f808aa9c6 100644
--- a/src/de/danoeh/antennapod/service/PlaybackService.java
+++ b/src/de/danoeh/antennapod/service/PlaybackService.java
@@ -783,7 +783,6 @@ public class PlaybackService extends Service {
                 DBWriter.removeQueueItem(PlaybackService.this, item.getId(), true);
             }
             DBWriter.addItemToPlaybackHistory(PlaybackService.this, (FeedMedia) media);
-            DBWriter.setFeedMedia(PlaybackService.this, (FeedMedia) media);
             long autoDeleteMediaId = ((FeedComponent) media).getId();
             if (shouldStream) {
                 autoDeleteMediaId = -1;
diff --git a/src/de/danoeh/antennapod/storage/DBWriter.java b/src/de/danoeh/antennapod/storage/DBWriter.java
index aed8b93c9..d96299dbe 100644
--- a/src/de/danoeh/antennapod/storage/DBWriter.java
+++ b/src/de/danoeh/antennapod/storage/DBWriter.java
@@ -215,7 +215,7 @@ public class DBWriter {
                 media.setPlaybackCompletionDate(new Date());
                 PodDBAdapter adapter = new PodDBAdapter(context);
                 adapter.open();
-                adapter.setMedia(media);
+                adapter.setFeedMediaPlaybackCompletionDate(media);
                 adapter.close();
                 EventDistributor.getInstance().sendPlaybackHistoryUpdateBroadcast();
 
diff --git a/src/de/danoeh/antennapod/storage/PodDBAdapter.java b/src/de/danoeh/antennapod/storage/PodDBAdapter.java
index 5799c6896..bb743e2b1 100644
--- a/src/de/danoeh/antennapod/storage/PodDBAdapter.java
+++ b/src/de/danoeh/antennapod/storage/PodDBAdapter.java
@@ -398,6 +398,17 @@ public class PodDBAdapter {
         }
     }
 
+    public void setFeedMediaPlaybackCompletionDate(FeedMedia media) {
+        if (media.getId() != 0) {
+            ContentValues values = new ContentValues();
+            values.put(KEY_PLAYBACK_COMPLETION_DATE, media.getPlaybackCompletionDate().getTime());
+            db.update(TABLE_NAME_FEED_MEDIA, values, KEY_ID + "=?",
+                    new String[]{String.valueOf(media.getId())});
+        } else {
+            Log.e(TAG, "setFeedMediaPlaybackCompletionDate: ID of media was 0");
+        }
+    }
+
     /**
      * Insert all FeedItems of a feed and the feed object itself in a single
      * transaction