diff --git a/Source/WebDriver/ChangeLog b/Source/WebDriver/ChangeLog
index 3c7f0c8bae4e..0443ed84aecb 100644
--- a/Source/WebDriver/ChangeLog
+++ b/Source/WebDriver/ChangeLog
@@ -1,3 +1,17 @@
+2017-12-11  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        WebDriver: get active element should return no such element error when there isn't an active element
+        https://bugs.webkit.org/show_bug.cgi?id=180421
+
+        Reviewed by Brian Burg.
+
+        We currently return unknown error.
+
+        Fixes: imported/w3c/webdriver/tests/element_retrieval/get_active_element.py::test_missing_document_element
+
+        * Session.cpp:
+        (WebDriver::Session::getActiveElement):
+
 2017-12-04  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         WebDriver: implement element property command
diff --git a/Source/WebDriver/Session.cpp b/Source/WebDriver/Session.cpp
index 98733f75a149..c564c6e64100 100644
--- a/Source/WebDriver/Session.cpp
+++ b/Source/WebDriver/Session.cpp
@@ -996,7 +996,7 @@ void Session::getActiveElement(Function<void (CommandResult&&)>&& completionHand
             }
             RefPtr<JSON::Object> elementObject = createElement(WTFMove(resultValue));
             if (!elementObject) {
-                completionHandler(CommandResult::fail(CommandResult::ErrorCode::UnknownError));
+                completionHandler(CommandResult::fail(CommandResult::ErrorCode::NoSuchElement));
                 return;
             }
             completionHandler(CommandResult::success(WTFMove(elementObject)));