diff --git a/src/Main.hs b/src/Main.hs
index 0ca7682..3b03e7b 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -59,11 +59,11 @@ instance FromJSON Config where
     Config                                <$>
     o .:  "downstream"                    <*>
     o .:? "downstream_certificate"        <*>
-    o .:  "client_certificates"           <*>
+    o .:? "client_certificates" .!= []    <*>
     o .:? "whitelist"   .!= []            <*>
     o .:? "blacklist"   .!= []            <*>
     o .:  "upstreams"                     <*>
-    o .:  "upstream_client_certificate"   <*>
+    o .:? "upstream_client_certificate"   <*>
     o .:  "timeout"
 
   parseJSON _ = fail "Expected object"