diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 4c2381ccffa7cedc1c501c149dec4cdad3147b0b..76c720248d8b2cacce69ba4547e1e046204f8e23 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,7 @@
 Search API 1.x, dev (xxxx-xx-xx):
 ---------------------------------
+- #2912246 by drunken monkey: Fixed inconsistent array indices in query
+  languages.
 - #2939405 by bserem, borisson_, drunken monkey, yoroy: Improved UI text on
   what is included in the index.
 - #2943705 by kevin.dutra, drunken monkey, borisson_: Fixed performance
diff --git a/phpcs.xml b/phpcs.xml
index 5ff5509b05c035b007c245775ee14a7cefcdc338..6449d595988294f837dc878734e3b64494b5411d 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -6,7 +6,7 @@
 
   <!-- Only include specific sniffs that pass. This ensures that, if new sniffs are added, HEAD does not fail.-->
   <!-- Drupal sniffs -->
-  <rule ref="Drupal.Array.DisallowLongArraySyntax"/>
+  <rule ref="Generic.Arrays.DisallowLongArraySyntax"/>
   <rule ref="Drupal.Classes.ClassCreateInstance"/>
   <rule ref="Drupal.Classes.ClassDeclaration"/>
   <rule ref="Drupal.Classes.FullyQualifiedNamespace"/>
diff --git a/src/Query/Query.php b/src/Query/Query.php
index 2c7b7be674e46eab72163c848fbad867b1efbad2..c07780f54ca341a9323efd0bc7e2f145633cc9d3 100644
--- a/src/Query/Query.php
+++ b/src/Query/Query.php
@@ -362,7 +362,7 @@ class Query implements QueryInterface {
    * {@inheritdoc}
    */
   public function setLanguages(array $languages = NULL) {
-    $this->languages = $languages;
+    $this->languages = isset($languages) ? array_values($languages) : NULL;
     return $this;
   }