diff --git a/server/webserver.cpp b/server/webserver.cpp
index 54257f87..a694c8f1 100644
--- a/server/webserver.cpp
+++ b/server/webserver.cpp
@@ -219,7 +219,7 @@ void WebServer::incomingConnection(qintptr socketDescriptor)
         socket->setLocalCertificate(m_certificate);
         connect(socket, SIGNAL(encrypted()), this, SLOT(onEncrypted()));
         socket->startServerEncryption();
-        // wait for encrypted connection before continue
+        // wait for encrypted connection before continue with this client
         return;
     }
 
@@ -319,8 +319,8 @@ void WebServer::readClient()
     }
 
     // reject everything else...
-    qCWarning(dcWebServer) << "Unknown message received. Respond client with 501: Not Implemented.";
-    HttpReply reply(HttpReply::NotImplemented);
+    qCWarning(dcWebServer) << "Unknown message received. Respond client with 400: Not Implemented.";
+    HttpReply reply(HttpReply::NotFound);
     reply.setPayload("404 Not found.");
     writeData(socket, reply.data());
 }
diff --git a/tests/auto/webserver/testwebserver.cpp b/tests/auto/webserver/testwebserver.cpp
index 8aaf5b48..2124b037 100644
--- a/tests/auto/webserver/testwebserver.cpp
+++ b/tests/auto/webserver/testwebserver.cpp
@@ -142,7 +142,7 @@ void TestWebserver::multiPackageMessage()
     bool ok = false;
     int statusCode = firstLineTokens.at(1).toInt(&ok);
     QVERIFY2(ok, "Could not convert statuscode from response to int");
-    QCOMPARE(statusCode, 501);
+    QCOMPARE(statusCode, 404);
 
     socket->close();
     socket->deleteLater();