diff --git a/server/core/admin.cc b/server/core/admin.cc
index f57cc4cac..16431f249 100644
--- a/server/core/admin.cc
+++ b/server/core/admin.cc
@@ -121,12 +121,7 @@ int Client::process(string url, string method, const char* upload_data, size_t*
 
     MXS_DEBUG("Request:\n%s", request.to_string().c_str());
 
-    if (url == "/")
-    {
-        // Respond to pings with 200 OK
-        reply = HttpResponse(MHD_HTTP_OK);
-    }
-    else if (request.validate_api_version())
+    if (request.validate_api_version())
     {
         reply = resource_handle_request(request);
     }
diff --git a/server/core/httprequest.cc b/server/core/httprequest.cc
index 870caf49b..dd71689b0 100644
--- a/server/core/httprequest.cc
+++ b/server/core/httprequest.cc
@@ -86,8 +86,11 @@ bool HttpRequest::validate_api_version()
 {
     bool rval = false;
 
-    if (m_resource_parts.size() > 0
-        && m_resource_parts[0] == MXS_REST_API_VERSION)
+    if (m_resource_parts.empty())
+    {
+        rval = true;
+    }
+    else if (m_resource_parts[0] == MXS_REST_API_VERSION)
     {
         m_resource_parts.pop_front();
         rval = true;