diff --git a/http/http_connection.hpp b/http/http_connection.hpp
index bfd6411..06bb63a 100644
--- a/http/http_connection.hpp
+++ b/http/http_connection.hpp
@@ -35,9 +35,7 @@
     res.addHeader("Content-Type", "text/html;charset=UTF-8");
 }
 
-#ifdef BMCWEB_ENABLE_DEBUG
-static std::atomic<int> connectionCount;
-#endif
+static int connectionCount = 0;
 
 // request body limit size set by the bmcwebHttpReqBodyLimitMb option
 constexpr unsigned int httpReqBodyLimit =
@@ -67,22 +65,20 @@
         prepareMutualTls();
 #endif // BMCWEB_ENABLE_MUTUAL_TLS_AUTHENTICATION
 
-#ifdef BMCWEB_ENABLE_DEBUG
         connectionCount++;
+
         BMCWEB_LOG_DEBUG << this << " Connection open, total "
                          << connectionCount;
-#endif
     }
 
     ~Connection()
     {
         res.setCompleteRequestHandler(nullptr);
         cancelDeadlineTimer();
-#ifdef BMCWEB_ENABLE_DEBUG
+
         connectionCount--;
         BMCWEB_LOG_DEBUG << this << " Connection closed, total "
                          << connectionCount;
-#endif
     }
 
     void prepareMutualTls()
@@ -277,6 +273,12 @@
 
     void start()
     {
+        if (connectionCount >= 100)
+        {
+            BMCWEB_LOG_CRITICAL << this << "Max connection count exceeded.";
+            return;
+        }
+
         startDeadline();
 
         // TODO(ed) Abstract this to a more clever class with the idea of an