diff --git a/TACTLib/Client/ClientHandler.cs b/TACTLib/Client/ClientHandler.cs
index 46aa2b8..0196a14 100644
--- a/TACTLib/Client/ClientHandler.cs
+++ b/TACTLib/Client/ClientHandler.cs
@@ -205,7 +205,7 @@ public ClientHandler(string? basePath, ClientCreateArgs createArgs) {
                     ConfigHandler = ConfigHandler.ForDynamicContainer(this);
             }
 
-            if (CreateArgs.Online && createArgs.LoadCDNIndices) {
+            if (CreateArgs.Online) {
                 if (CanShareCDNData(CreateArgs.TryShareCDNIndexWithHandler)) {
                     CDNIndex = CreateArgs.TryShareCDNIndexWithHandler.CDNIndex;
                 } else {
diff --git a/TACTLib/Protocol/CDNIndexHandler.cs b/TACTLib/Protocol/CDNIndexHandler.cs
index 3534973..e04e9b5 100644
--- a/TACTLib/Protocol/CDNIndexHandler.cs
+++ b/TACTLib/Protocol/CDNIndexHandler.cs
@@ -61,6 +61,12 @@ private CDNIndexHandler(ClientHandler client)
             //    return;
             //}
             
+            if (!client.CreateArgs.LoadCDNIndices)
+            {
+                // we could download a million indices and that's quite expensive...
+                // only loose files will be available
+                return;
+            }
             for (var index = 0; index < client.ConfigHandler.CDNConfig.Archives.Count; index++)
             {
                 string archive = client.ConfigHandler.CDNConfig.Archives[index];