diff --git a/src/argv.js b/src/argv.js
index 44d65076..31ac198d 100755
--- a/src/argv.js
+++ b/src/argv.js
@@ -323,7 +323,6 @@ const { argv } = yargs
 		describe: 'Remove all orphaned media items from database and disk.',
 		type: 'boolean',
 		alias: 'flush-media',
-		default: config.media.flushOrphaned,
 	})
 	.option('flush-media-files', {
 		describe: 'Remove files from storage when flushing media.',
diff --git a/src/media.js b/src/media.js
index ae69b3d6..bb5f4943 100755
--- a/src/media.js
+++ b/src/media.js
@@ -1056,6 +1056,11 @@ async function deleteS3Objects(allMedia) {
 }
 
 async function flushOrphanedMedia(stage = 1) {
+	if (!config.media.flushOrphaned) {
+		logger.verbose('Orphaned media flush skipped, disabled in config');
+		return;
+	}
+
 	logger.info(`Flushing orphaned media, stage ${stage}`);
 
 	const orphanedMedia = await knex('media')