diff --git a/CHANGELOG b/CHANGELOG
index 907d3de3ad61..a9c9fcaed4a4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,11 @@
 devel
 -----
 
-* Add optimization rule for AqlAnalyzer 
+* Fixed issue BTS-539 "Unsynchronized query kill while it's being finalized in
+  another thread was uncovered through `test-kill.js` of `communication_ssl`
+  suite". Fixed possible (but unlikely) crash when killing an AQL query.
+
+* Add optimization rule for AqlAnalyzer/
 
 * Append physical compaction of log collection to every Raft log
   compaction (BTS-542).
diff --git a/arangod/Aql/Query.cpp b/arangod/Aql/Query.cpp
index 0fc52b6017a1..156ada564b4f 100644
--- a/arangod/Aql/Query.cpp
+++ b/arangod/Aql/Query.cpp
@@ -186,8 +186,6 @@ Query::~Query() {
                                               << " this: " << (uintptr_t)this;
   }
 
-  _queryProfile.reset(); // unregister from QueryList
-
   // log to audit log
   if (!_queryOptions.skipAudit &&
      (ServerState::instance()->isCoordinator() ||
@@ -208,6 +206,8 @@ Query::~Query() {
     // the destructor
   }
 
+  _queryProfile.reset(); // unregister from QueryList
+
   unregisterSnippets();
 
   exitV8Context();