diff --git a/enclave/Enclave.config.production.xml b/enclave/Enclave.config.production.xml
index 4903d5ccbb..9ea98e8fea 100644
--- a/enclave/Enclave.config.production.xml
+++ b/enclave/Enclave.config.production.xml
@@ -4,7 +4,7 @@
   <ISVSVN>0</ISVSVN>
   <StackMaxSize>0x40000</StackMaxSize>
   <HeapMaxSize>0x20000000</HeapMaxSize>
-  <TCSNum>4</TCSNum>
+  <TCSNum>8</TCSNum>
   <TCSPolicy>0</TCSPolicy> <!-- 0 = Thread Control Structure (TCS) is bound to the untrusted thread -->
   <DisableDebug>1</DisableDebug>
   <MiscSelect>0</MiscSelect>
diff --git a/enclave/Enclave.config.xml b/enclave/Enclave.config.xml
index b5379ffb31..b853d045a2 100644
--- a/enclave/Enclave.config.xml
+++ b/enclave/Enclave.config.xml
@@ -4,7 +4,7 @@
   <ISVSVN>0</ISVSVN>
   <StackMaxSize>0x40000</StackMaxSize>
   <HeapMaxSize>0x20000000</HeapMaxSize>
-  <TCSNum>4</TCSNum>
+  <TCSNum>8</TCSNum>
   <TCSPolicy>0</TCSPolicy> <!-- 0 = Thread Control Structure (TCS) is bound to the untrusted thread -->
   <DisableDebug>0</DisableDebug>
   <MiscSelect>0</MiscSelect>