diff --git a/src/NzbDrone.Core/Organizer/NamingConfigService.cs b/src/NzbDrone.Core/Organizer/NamingConfigService.cs
index 1cbe993dc..ec802bc00 100644
--- a/src/NzbDrone.Core/Organizer/NamingConfigService.cs
+++ b/src/NzbDrone.Core/Organizer/NamingConfigService.cs
@@ -21,8 +21,16 @@ namespace NzbDrone.Core.Organizer
 
             if (config == null)
             {
-                _repository.Insert(NamingConfig.Default);
-                config = _repository.Single();
+                lock (_repository)
+                    {
+                    config = _repository.SingleOrDefault();
+
+                    if (config == null)
+                    {
+                        _repository.Insert(NamingConfig.Default);
+                        config = _repository.Single();
+                    }
+                }
             }
 
             return config;
@@ -33,4 +41,4 @@ namespace NzbDrone.Core.Organizer
             _repository.Upsert(namingConfig);
         }
     }
-}
\ No newline at end of file
+}