diff --git a/core/modules/views/src/Controller/ViewAjaxController.php b/core/modules/views/src/Controller/ViewAjaxController.php
index f1aedd0..92cd82e 100644
--- a/core/modules/views/src/Controller/ViewAjaxController.php
+++ b/core/modules/views/src/Controller/ViewAjaxController.php
@@ -12,6 +12,8 @@
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\EventSubscriber\AjaxResponseSubscriber;
+use Drupal\Core\EventSubscriber\MainContentViewSubscriber;
+use Drupal\Core\Form\FormBuilderInterface;
 use Drupal\Core\Path\CurrentPathStack;
 use Drupal\Core\Render\BubbleableMetadata;
 use Drupal\Core\Render\RenderContext;
@@ -163,9 +165,11 @@ public function ajaxView(Request $request) {
         $origin_destination = $path;
 
         // Remove some special parameters you never want to have part of
+        // the destination query.
         $used_query_parameters = $request->query->all();
-        // destination query.
-        unset($used_query_parameters['_wrapper_format'], $used_query_parameters['ajax_page_state']);
+        // @todo Remove this parsing once these are removed from the request in
+        //   https://www.drupal.org/node/2504709.
+        unset($used_query_parameters[FormBuilderInterface::AJAX_FORM_REQUEST], $used_query_parameters[MainContentViewSubscriber::WRAPPER_FORMAT], $used_query_parameters['ajax_page_state']);
 
         $query = UrlHelper::buildQuery($used_query_parameters);
         if ($query != '') {