diff --git a/functions.php b/functions.php
index 1cdd5e2c9..50374dc1d 100644
--- a/functions.php
+++ b/functions.php
@@ -311,6 +311,10 @@
 			}
 		}	
 
+		purge_orphans($link);
+	}
+
+	function purge_orphans($link) {
 		// purge orphaned posts in main content table
 		db_query($link, "DELETE FROM ttrss_entries WHERE 
 			(SELECT COUNT(int_id) FROM ttrss_user_entries WHERE ref_id = id) = 0");
@@ -5707,8 +5711,10 @@
 			sleep(1); // prevent flood (FIXME make this an option?)
 		}
 
-	// Send feed digests by email if needed.
-	if (DAEMON_SENDS_DIGESTS) send_headlines_digests($link);
+		// Send feed digests by email if needed.
+		if (DAEMON_SENDS_DIGESTS) send_headlines_digests($link);
+
+		purge_orphans($link);
 
 	} // function update_daemon_common
 
diff --git a/update_daemon_loop.php b/update_daemon_loop.php
index 668b19abc..56b3839a2 100644
--- a/update_daemon_loop.php
+++ b/update_daemon_loop.php
@@ -79,7 +79,6 @@
 		_debug("Finished, $count feeds processed.");
 	}
 
-
 	db_close($link);
 
 ?>
diff --git a/update_feeds.php b/update_feeds.php
index e08c6f392..588a0a9b5 100644
--- a/update_feeds.php
+++ b/update_feeds.php
@@ -44,9 +44,6 @@
 	// Update all feeds needing a update.
 	update_daemon_common($link);
 
-	// Send feed digests by email if needed.
-	if (DAEMON_SENDS_DIGESTS) send_headlines_digests($link);
-
 	db_close($link);
 
 	unlink(LOCK_DIRECTORY . "/$lock_filename");