diff --git a/matrix_client/api.py b/matrix_client/api.py
index 7e124262..58af7823 100644
--- a/matrix_client/api.py
+++ b/matrix_client/api.py
@@ -57,6 +57,7 @@ def __init__(self, base_url, token=None):
             self.url = base_url
         self.token = token
         self.txn_id = 0
+        self.validate_cert = True
 
     def initial_sync(self, limit=1):
         """Perform /initialSync.
@@ -66,6 +67,10 @@ def initial_sync(self, limit=1):
         """
         return self._send("GET", "/initialSync", query_params={"limit": limit})
 
+    def validate_certificate(self, valid):
+        self.validate_cert = valid
+        return
+
     def register(self, login_type, **kwargs):
         """Performs /register.
 
@@ -306,7 +311,7 @@ def _send(self, method, path, content=None, query_params={}, headers={}):
         response = requests.request(
             method, endpoint, params=query_params,
             data=json.dumps(content), headers=headers
-            # , verify=False  #if you want to use SSL without verifying the Cert
+            , verify=self.validate_cert  #if you want to use SSL without verifying the Cert
         )
 
         if response.status_code < 200 or response.status_code >= 300:
diff --git a/matrix_client/client.py b/matrix_client/client.py
index e34963bc..ea89dc6c 100644
--- a/matrix_client/client.py
+++ b/matrix_client/client.py
@@ -51,8 +51,9 @@ def global_callback(incoming_event):
 
     """
 
-    def __init__(self, base_url, token=None):
+    def __init__(self, base_url, token=None, valid_cert_check=True):
         self.api = MatrixHttpApi(base_url, token)
+        self.api.validate_certificate(valid_cert_check)
         self.listeners = []
         self.rooms = {
             # room_id: Room