diff --git a/conf/configuration.go b/conf/configuration.go
index 879a0136..76e9d92c 100644
--- a/conf/configuration.go
+++ b/conf/configuration.go
@@ -40,7 +40,7 @@ type configOptions struct {
 	// DevFlags. These are used to enable/disable debugging and incomplete features
 	DevLogSourceLine           bool
 	DevAutoCreateAdminPassword string
-	DevNewScanner              bool
+	DevOldScanner              bool
 }
 
 var Server = &configOptions{}
@@ -99,7 +99,7 @@ func init() {
 	// DevFlags. These are used to enable/disable debugging and incomplete features
 	viper.SetDefault("devlogsourceline", false)
 	viper.SetDefault("devautocreateadminpassword", "")
-	viper.SetDefault("devnewscanner", false)
+	viper.SetDefault("devoldscanner", false)
 }
 
 func InitConfig(cfgFile string) {
diff --git a/scanner/scanner.go b/scanner/scanner.go
index 49d6e048..f9af2445 100644
--- a/scanner/scanner.go
+++ b/scanner/scanner.go
@@ -87,11 +87,10 @@ func (s *Scanner) loadFolders() {
 }
 
 func (s *Scanner) newScanner(f model.MediaFolder) FolderScanner {
-	if conf.Server.DevNewScanner {
-		log.Warn("Using *experimental* new scanner")
-		return NewTagScanner2(f.Path, s.ds)
+	if conf.Server.DevOldScanner {
+		return NewTagScanner(f.Path, s.ds)
 	}
-	return NewTagScanner(f.Path, s.ds)
+	return NewTagScanner2(f.Path, s.ds)
 }
 
 type Status int