diff --git a/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs b/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs
index 3abe6d4df8..adbc4241f9 100644
--- a/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs
+++ b/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs
@@ -162,6 +162,13 @@ namespace MediaBrowser.Controller.Providers.Movies
 
             await _tmdbSettingsSemaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
 
+            // Check again in case it got populated while we were waiting.
+            if (_tmdbSettings != null)
+            {
+                _tmdbSettingsSemaphore.Release();
+                return _tmdbSettings;
+            }
+            
             try
             {
                 using (var json = await GetMovieDbResponse(new HttpRequestOptions