diff --git a/libraries/embedded-webserver/src/HTTPManager.cpp b/libraries/embedded-webserver/src/HTTPManager.cpp
index 946da00a34..72436fc55e 100644
--- a/libraries/embedded-webserver/src/HTTPManager.cpp
+++ b/libraries/embedded-webserver/src/HTTPManager.cpp
@@ -29,14 +29,10 @@ HTTPManager::HTTPManager(quint16 port, const QString& documentRoot, HTTPRequestH
     _requestHandler(requestHandler),
     _port(port)
 {
-    qCDebug(embeddedwebserver) << "Attempting to bind TCP socket on port " << QString::number(_port);
-    
-    if (listen(QHostAddress::AnyIPv4, _port)) {
-        qCDebug(embeddedwebserver) << "TCP socket is listening on" << serverAddress() << "and port" << serverPort();
-    } else {
-        qCritical() << "Failed to open HTTP server socket:" << errorString() << " - forcing exit.";
-        QCoreApplication::exit(SOCKET_ERROR_EXIT_CODE);
-    }
+    bindSocket();
+    _isListeningTimer = new QTimer(this);
+    connect(_isListeningTimer, &QTimer::timeout, this, &HTTPManager::isTcpServerListening);
+    _isListeningTimer->start(SOCKET_CHECK_INTERVAL_IN_MS);
 }
 
 void HTTPManager::incomingConnection(qintptr socketDescriptor) {
@@ -166,3 +162,18 @@ bool HTTPManager::requestHandledByRequestHandler(HTTPConnection* connection, con
     return _requestHandler && _requestHandler->handleHTTPRequest(connection, url);
 }
 
+void HTTPManager::isTcpServerListening() {
+    if (!isListening()) {
+        qCWarning(embeddedwebserver) << "Socket on port " << QString::number(_port) << " is no longer listening";
+        bindSocket();
+    }
+}
+
+bool HTTPManager::bindSocket() {
+    qCDebug(embeddedwebserver) << "Attempting to bind TCP socket on port " << QString::number(_port);
+    if (!listen(QHostAddress::Any, _port)) {
+        qCritical() << "Failed to open HTTP server socket:" << errorString() << " can't continue";
+        QCoreApplication::exit(SOCKET_ERROR_EXIT_CODE);
+    }
+    return true;
+}
\ No newline at end of file
diff --git a/libraries/embedded-webserver/src/HTTPManager.h b/libraries/embedded-webserver/src/HTTPManager.h
index 8e1780a631..6375b10205 100644
--- a/libraries/embedded-webserver/src/HTTPManager.h
+++ b/libraries/embedded-webserver/src/HTTPManager.h
@@ -37,6 +37,12 @@ public:
     
     bool handleHTTPRequest(HTTPConnection* connection, const QUrl& url, bool skipSubHandler = false);
 
+private slots:
+    void isTcpServerListening();
+    
+private:
+    bool bindSocket();
+    
 protected:
     /// Accepts all pending connections
     virtual void incomingConnection(qintptr socketDescriptor);
@@ -44,6 +50,7 @@ protected:
     
     QString _documentRoot;
     HTTPRequestHandler* _requestHandler;
+    QTimer* _isListeningTimer;
     const quint16 _port;
 };