diff --git a/NEWS b/NEWS
index ce8dc035321a2bc6045c5d75fd14d6387cae6200..908de1fc6500ec5da2cd01d2c1d9eec6024b3f96 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@ Next Version
 - fixed subitem behavior of MLShow and MLAlbum on removal
 - MLTitleDecrapifier handles shows with more than 99 and less than 1000
   episodes correctly now
+- added user defaults option to disable file name display optimizations
+  when media is newly added to the library
 
 Added Public APIs:
 - MLShow:
diff --git a/Sources/MLMediaLibrary.m b/Sources/MLMediaLibrary.m
index 1d47e9fa7d84c0941564df02fe9e569a8daaefc0..f1e8cbfd0b377110db751ef6e9eda198c71e1b62 100644
--- a/Sources/MLMediaLibrary.m
+++ b/Sources/MLMediaLibrary.m
@@ -46,6 +46,7 @@
 // Pref key
 static NSString *kLastTVDBUpdateServerTime = @"MLLastTVDBUpdateServerTime";
 static NSString *kUpdatedToTheGreatSharkHuntDatabaseFormat = @"upgradedToDatabaseFormat 2.3";
+static NSString *kDecrapifyTitles = @"MLDecrapifyTitles";
 
 #if HAVE_BLOCK
 @interface MLMediaLibrary ()
@@ -59,7 +60,8 @@ static NSString *kUpdatedToTheGreatSharkHuntDatabaseFormat = @"upgradedToDatabas
 @implementation MLMediaLibrary
 + (void)initialize
 {
-    [[NSUserDefaults standardUserDefaults] registerDefaults:@{kUpdatedToTheGreatSharkHuntDatabaseFormat : [NSNumber numberWithBool:NO]}];
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    [defaults registerDefaults:@{kUpdatedToTheGreatSharkHuntDatabaseFormat : [NSNumber numberWithBool:NO], kDecrapifyTitles : [NSNumber numberWithBool:YES]}];
 }
 
 + (id)sharedMediaLibrary
@@ -602,7 +604,10 @@ static NSString *kUpdatedToTheGreatSharkHuntDatabaseFormat = @"upgradedToDatabas
     }
 #endif
 
-    file.title = [MLTitleDecrapifier decrapify:[title stringByDeletingPathExtension]];
+    if ([[[NSUserDefaults standardUserDefaults] objectForKey:kDecrapifyTitles] boolValue] == YES)
+        file.title = [MLTitleDecrapifier decrapify:[title stringByDeletingPathExtension]];
+    else
+        file.title = [title stringByDeletingPathExtension];
 
     if ([size longLongValue] < 150000000) /* 150 MB */
         file.type = kMLFileTypeClip;