diff --git a/src/main/java/com/uid2/core/util/MetadataHelper.java b/src/main/java/com/uid2/core/util/MetadataHelper.java
index 86dc577c..12fe8259 100644
--- a/src/main/java/com/uid2/core/util/MetadataHelper.java
+++ b/src/main/java/com/uid2/core/util/MetadataHelper.java
@@ -36,7 +36,7 @@ public static String getMetadataPathName(OperatorType operatorType, int siteId,
         StoreScope store;
         Boolean providePrivateSiteData = ConfigStore.Global.getBoolean("provide_private_site_data");
         if (supportsDecryption) { // Check if decryption is possible
-            if (operatorType == OperatorType.PUBLIC ) //siteId_public folder
+            if (operatorType == OperatorType.PUBLIC || (providePrivateSiteData == null || !providePrivateSiteData.booleanValue())) //siteId_public folder
             {
                 store = new EncryptedScope(new CloudPath(metadataPathName), siteId, true);
             } else //siteId_private folder