diff --git a/src/Plugin/views/display/ViewsBlockOverride.php b/src/Plugin/views/display/ViewsBlockOverride.php
index 1a802ba50c917b51ae5ca7af9ac2be7f5640c2cf..6dd06d1251f767727dde4f1412558d0d02b37561 100644
--- a/src/Plugin/views/display/ViewsBlockOverride.php
+++ b/src/Plugin/views/display/ViewsBlockOverride.php
@@ -488,17 +488,16 @@ class ViewsBlockOverride extends Block implements ContainerFactoryPluginInterfac
       $this->view->setArguments($view_args);
     }
 
-    if (!empty($config['more_link_text'])) {
-      $this->view->display_handler->setOption('use_more', TRUE);
-      $this->view->display_handler->setOption('use_more_text', $config['more_link_text']);
-    }
-
     if (!empty($config['more_link_custom_url'])) {
       $this->view->display_handler->setOption('use_more', TRUE);
       $this->view->display_handler->setOption('link_display', 'custom_url');
       $this->view->display_handler->setOption('link_url', $config['more_link_custom_url']);
     }
 
+    if (!empty($config['more_link_text']) && $this->view->display_handler->getOption('use_more')) {
+      $this->view->display_handler->setOption('use_more_text', $config['more_link_text']);
+    }
+
     return parent::execute();
   }