diff --git a/src/ripple/app/main/Application.cpp b/src/ripple/app/main/Application.cpp
index 58a27a384..74b2a7dfb 100644
--- a/src/ripple/app/main/Application.cpp
+++ b/src/ripple/app/main/Application.cpp
@@ -712,8 +712,11 @@ public:
         //
         //----------------------------------------------------------------------
 
-        serverHandler_->setup (setup_ServerHandler(getConfig(), std::cerr),
-            m_journal);
+        {
+            auto setup = setup_ServerHandler(getConfig(), std::cerr);
+            setup.makeContexts();
+            serverHandler_->setup (setup, m_journal);
+        }
 
         // VFALCO NOTE Unfortunately, in stand-alone mode some code still
         //             foolishly calls overlay(). When this is fixed we can
diff --git a/src/ripple/server/Port.h b/src/ripple/server/Port.h
index a4394bc6a..5fb73b1ad 100644
--- a/src/ripple/server/Port.h
+++ b/src/ripple/server/Port.h
@@ -54,6 +54,11 @@ struct Port
     bool
     websockets() const;
 
+    // Returns `true` if any secure protocols are specified
+    template <class = void>
+    bool
+    secure() const;
+
     // Returns a string containing the list of protocols
     template <class = void>
     std::string
@@ -69,6 +74,14 @@ Port::websockets() const
     return protocol.count("ws") > 0 || protocol.count("wss") > 0;
 }
 
+template <class>
+bool
+Port::secure() const
+{
+    return protocol.count("peer") > 0 ||
+        protocol.count("https") > 0 || protocol.count("wss") > 0;
+}
+
 template <class>
 std::string
 Port::protocols() const
diff --git a/src/ripple/server/ServerHandler.h b/src/ripple/server/ServerHandler.h
index f7754a9a2..91993c9ea 100644
--- a/src/ripple/server/ServerHandler.h
+++ b/src/ripple/server/ServerHandler.h
@@ -66,6 +66,9 @@ public:
         };
 
         overlay_t overlay;
+
+        void
+        makeContexts();
     };
 
     virtual
diff --git a/src/ripple/server/impl/ServerHandlerImp.cpp b/src/ripple/server/impl/ServerHandlerImp.cpp
index c8a86b39e..f756bbbd1 100644
--- a/src/ripple/server/impl/ServerHandlerImp.cpp
+++ b/src/ripple/server/impl/ServerHandlerImp.cpp
@@ -427,6 +427,29 @@ adminRole (HTTP::Port const& port,
 
 //------------------------------------------------------------------------------
 
+void
+ServerHandler::Setup::makeContexts()
+{
+    for(auto& p : ports)
+    {
+        if (p.secure())
+        {
+            if (p.ssl_key.empty() && p.ssl_cert.empty() &&
+                    p.ssl_chain.empty())
+                p.context = make_SSLContext();
+            else
+                p.context = make_SSLContextAuthed (
+                    p.ssl_key, p.ssl_cert, p.ssl_chain);
+        }
+        else
+        {
+            p.context = std::make_shared<
+                boost::asio::ssl::context>(
+                    boost::asio::ssl::context::sslv23);
+        }
+    }
+}
+
 namespace detail {
 
 // Parse a comma-delimited list of values.
@@ -616,13 +639,6 @@ to_Port(ParsedPort const& parsed, std::ostream& log)
     p.ssl_cert = parsed.ssl_cert;
     p.ssl_chain = parsed.ssl_chain;
 
-    if (p.ssl_key.empty() && p.ssl_cert.empty() &&
-            p.ssl_chain.empty())
-        p.context = make_SSLContext();
-    else
-        p.context = make_SSLContextAuthed (
-            p.ssl_key, p.ssl_cert, p.ssl_chain);
-
     return p;
 }