diff --git a/domain-server/src/DomainMetadata.cpp b/domain-server/src/DomainMetadata.cpp
index f9f79d0846..b920ab022b 100644
--- a/domain-server/src/DomainMetadata.cpp
+++ b/domain-server/src/DomainMetadata.cpp
@@ -221,7 +221,7 @@ void DomainMetadata::sendDescriptors() {
     }
 }
 
-bool DomainMetadataExporter::handleHTTPRequest(HTTPConnection* connection, const QUrl& url, bool skipSubHandler) {
+bool DomainMetadata::handleHTTPRequest(HTTPConnection* connection, const QUrl& url, bool skipSubHandler) {
     QString domainMetadataJSON = QString("{\"domain\":%1}").arg(QString(QJsonDocument(get(DESCRIPTORS)).toJson(QJsonDocument::Compact)));
     const QString URI_METADATA = "/metadata";
     const QString EXPORTER_MIME_TYPE = "text/plain";
diff --git a/domain-server/src/DomainMetadata.h b/domain-server/src/DomainMetadata.h
index eade025a0a..4c4f8ecf3c 100644
--- a/domain-server/src/DomainMetadata.h
+++ b/domain-server/src/DomainMetadata.h
@@ -17,11 +17,7 @@
 #include <QJsonObject>
 #include "HTTPManager.h"
 
-class DomainMetadataExporter : public HTTPRequestHandler {
-    bool handleHTTPRequest(HTTPConnection* connection, const QUrl& url, bool skipSubHandler = false);
-};
-
-class DomainMetadata : public QObject {
+class DomainMetadata : public QObject, public HTTPRequestHandler {
 Q_OBJECT
 
 public:
@@ -53,6 +49,8 @@ public:
     QJsonObject get();
     QJsonObject get(const QString& group);
 
+    bool handleHTTPRequest(HTTPConnection* connection, const QUrl& url, bool skipSubHandler = false);
+
 public slots:
     void descriptorsChanged();
     void securityChanged(bool send);
diff --git a/domain-server/src/DomainServer.h b/domain-server/src/DomainServer.h
index 34555861af..a4a47f5f46 100644
--- a/domain-server/src/DomainServer.h
+++ b/domain-server/src/DomainServer.h
@@ -242,7 +242,7 @@ private:
 
     HTTPManager _httpManager;
     HTTPManager* _httpExporterManager { nullptr };
-    HTTPManager* _httpMetadataExporterManager;
+    HTTPManager* _httpMetadataExporterManager { nullptr };
     
     std::unique_ptr<HTTPSManager> _httpsManager;