diff --git a/core/modules/views/src/Plugin/Derivative/ViewsBlock.php b/core/modules/views/src/Plugin/Derivative/ViewsBlock.php
index ac25a9f..909b682 100644
--- a/core/modules/views/src/Plugin/Derivative/ViewsBlock.php
+++ b/core/modules/views/src/Plugin/Derivative/ViewsBlock.php
@@ -115,7 +115,7 @@ public function getDerivativeDefinitions($base_plugin_definition) {
           // Look for arguments and expose them as context.
           foreach ($display->getHandlers('argument') as $argument_name => $argument) {
             /** @var \Drupal\views\Plugin\views\argument\ArgumentPluginBase $argument */
-            if ($validator = $argument->getPlugin('argument_validator')) {
+            if (($validator = $argument->getPlugin('argument_validator')) && $validator->getPluginId() != 'none') {
               /** @var \Drupal\views\Plugin\views\argument_validator\ArgumentValidatorPluginBase $validator */
               if (strpos($validator->getPluginId(), 'entity:') !== FALSE) {
                 $this->derivatives[$delta]['context'][$argument_name] = new ContextDefinition($argument->getPlugin('argument_validator')->getPluginId(), $argument->adminLabel(), FALSE);