diff --git a/server/core/gateway.cc b/server/core/gateway.cc
index a0a188c37..cc7d68e2a 100644
--- a/server/core/gateway.cc
+++ b/server/core/gateway.cc
@@ -2023,6 +2023,9 @@ int main(int argc, char **argv)
     unlock_pidfile();
     unlink_pidfile();
 
+    ERR_free_strings();
+    EVP_cleanup();
+
 return_main:
 
     mxs_log_flush_sync();