diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 76b76e644e4749d654b9495bc8b67a3bd0255b47..9f75dc681d6f24e4c237a1920f49e30202ec366d 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,7 @@
 Search API 1.x, dev (xxxx-xx-xx):
 ---------------------------------
+- #2939085 by mattgill, drunken monkey: Fixed fatal error in Views when trying
+  to set keywords conjunction on aborted query.
 - #2933811 by drunken monkey: Fixed coding standards in new Drush code.
 - #2932347 by drunken monkey, ghaya: Fixed case insensitive matching for
   highlighting non-ASCII text.
diff --git a/src/Plugin/views/filter/SearchApiFulltext.php b/src/Plugin/views/filter/SearchApiFulltext.php
index f13b63605f43bdb6c1381fcecd60b816fe6e6afb..d02be82f23c3be2bb637b8f6d12741b0bb782f9c 100644
--- a/src/Plugin/views/filter/SearchApiFulltext.php
+++ b/src/Plugin/views/filter/SearchApiFulltext.php
@@ -280,6 +280,9 @@ class SearchApiFulltext extends FilterPluginBase {
     $fields = $this->options['fields'];
     $fields = $fields ? $fields : array_keys($this->getFulltextFields());
     $query = $this->getQuery();
+    if ($query->shouldAbort()) {
+      return;
+    }
 
     if ($this->options['parse_mode']) {
       $parse_mode = $this->getParseModeManager()
diff --git a/src/Plugin/views/query/SearchApiQuery.php b/src/Plugin/views/query/SearchApiQuery.php
index 2263296f9225d8b3cf402efabff590509c3bbbd9..eaf0873851a62848b50c1ba22d7d9d1f3ab8ec45 100644
--- a/src/Plugin/views/query/SearchApiQuery.php
+++ b/src/Plugin/views/query/SearchApiQuery.php
@@ -680,8 +680,8 @@ class SearchApiQuery extends QueryPluginBase {
   /**
    * Retrieves the parse mode.
    *
-   * @return \Drupal\search_api\ParseMode\ParseModeInterface
-   *   The parse mode.
+   * @return \Drupal\search_api\ParseMode\ParseModeInterface|null
+   *   The parse mode, or NULL if the query was aborted.
    *
    * @see \Drupal\search_api\Query\QueryInterface::getParseMode()
    */