diff --git a/rida.py b/rida.py
index f4a34858..9d196db9 100755
--- a/rida.py
+++ b/rida.py
@@ -165,6 +165,8 @@ def query_build(id):
         return "No such module found.", 404
 
 def _establish_ssl_context(conf):
+    if conf.ssl_enabled == False:
+        return None
     # First, do some validation of the configuration
     attributes = (
         'ssl_certificate_file',
diff --git a/rida/config.py b/rida/config.py
index 0bfbc1be..87faa25a 100644
--- a/rida/config.py
+++ b/rida/config.py
@@ -78,6 +78,7 @@ def from_file(filename=None):
     conf.port = default.get("port")
     conf.host = default.get("host")
 
+    conf.ssl_enabled = asbool(default.get("ssl_enabled"))
     conf.ssl_certificate_file = default.get("ssl_certificate_file")
     conf.ssl_certificate_key_file = default.get("ssl_certificate_key_file")
     conf.ssl_ca_certificate_file = default.get("ssl_ca_certificate_file")