1 files changed, 7 insertions, 0 deletions
diff --git a/MediaBrowser.Server.Implementations/Library/UserManager.cs b/MediaBrowser.Server.Implementations/Library/UserManager.cs
index 3d6432636..3020a224d 100644
--- a/MediaBrowser.Server.Implementations/Library/UserManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/UserManager.cs
@@ -411,6 +411,7 @@ namespace MediaBrowser.Server.Implementations.Library
                     catch
                     {
                         user.Policy.EnabledFolders = new string[] { };
+                        user.Policy.EnableAllFolders = true;
                     }
                 }
                 else
@@ -419,6 +420,12 @@ namespace MediaBrowser.Server.Implementations.Library
                     user.Policy.EnabledFolders = new string[] { };
                 }
 
+                // Just to be safe
+                if (user.Policy.EnabledFolders.Length == 0)
+                {
+                    user.Policy.EnableAllFolders = true;
+                }
+
                 user.Policy.BlockedMediaFolders = null;
 
                 await UpdateUserPolicy(user, user.Policy, false);