diff --git a/src/Worker/ExpirePosts.php b/src/Worker/ExpirePosts.php
index d51e956a56..c8120be287 100644
--- a/src/Worker/ExpirePosts.php
+++ b/src/Worker/ExpirePosts.php
@@ -47,7 +47,9 @@ class ExpirePosts
 
 		self::deleteExpiredExternalPosts();
 
-		self::addMissingEntries();
+		if (DI::config()->get('system', 'add_missing_posts')) {
+			self::addMissingEntries();
+		}
 
 		// Set the expiry for origin posta
 		Worker::add(PRIORITY_LOW, 'Expire');
diff --git a/static/settings.config.php b/static/settings.config.php
index c05e675edb..b608307a90 100644
--- a/static/settings.config.php
+++ b/static/settings.config.php
@@ -56,6 +56,10 @@ return [
 		// Manual list of addons which are enabled on this system.
 		'addon' => '',
 
+		// add_missing_posts (boolean)
+		// Checks for missing entries in "post", "post-thread" or "post-thread-user" and creates them
+		'add_missing_posts' => false,
+
 		// allowed_themes (Comma-separated list)
 		// Themes users can change to in their settings.
 		'allowed_themes' => 'quattro,vier,duepuntozero,smoothly',