diff --git a/lib/behat/extension/Moodle/BehatExtension/Driver/WebDriver.php b/lib/behat/extension/Moodle/BehatExtension/Driver/WebDriver.php
index 7fc601f54e0..e6c24df0937 100644
--- a/lib/behat/extension/Moodle/BehatExtension/Driver/WebDriver.php
+++ b/lib/behat/extension/Moodle/BehatExtension/Driver/WebDriver.php
@@ -16,6 +16,7 @@
 
 namespace Moodle\BehatExtension\Driver;
 
+use Behat\Mink\Exception\DriverException;
 use OAndreyev\Mink\Driver\WebDriver as UpstreamDriver;
 
 // phpcs:disable moodle.NamingConventions.ValidFunctionName.LowercaseMethod
@@ -79,4 +80,14 @@ class WebDriver extends UpstreamDriver {
     public function post_key($key, $xpath) {
         throw new \Exception('No longer used - please use keyDown and keyUp');
     }
+
+    #[\Override]
+    public function stop(): void {
+        try {
+            parent::stop();
+        } catch (DriverException $e) {
+            error_log($e->getMessage());
+            $this->webDriver = null;
+        }
+    }
 }