diff --git a/app/code/Magento/LoginAsCustomer/Cron/DeleteExpiredAuthenticationData.php b/app/code/Magento/LoginAsCustomer/Cron/DeleteExpiredAuthenticationData.php
deleted file mode 100644
index 5acb602491f0b..0000000000000
--- a/app/code/Magento/LoginAsCustomer/Cron/DeleteExpiredAuthenticationData.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\LoginAsCustomer\Cron;
-
-use Magento\LoginAsCustomerApi\Api\ConfigInterface;
-use Magento\LoginAsCustomerApi\Api\DeleteExpiredAuthenticationDataInterface;
-
-/**
- * Delete expired authentication data cron task
- */
-class DeleteExpiredAuthenticationData
-{
-    /**
-     * @var DeleteExpiredAuthenticationDataInterface
-     */
-    private $deleteOldSecretsProcessor;
-
-    /**
-     * @var ConfigInterface
-     */
-    private $config;
-
-    /**
-     * @param DeleteExpiredAuthenticationDataInterface $deleteOldSecretsProcessor
-     * @param ConfigInterface $config
-     */
-    public function __construct(
-        DeleteExpiredAuthenticationDataInterface $deleteOldSecretsProcessor,
-        ConfigInterface $config
-    ) {
-        $this->deleteOldSecretsProcessor = $deleteOldSecretsProcessor;
-        $this->config = $config;
-    }
-
-    /**
-     * Delete expired authentication data
-     */
-    public function execute(): void
-    {
-        if ($this->config->isEnabled()) {
-            $this->deleteOldSecretsProcessor->execute();
-        }
-    }
-}
diff --git a/app/code/Magento/LoginAsCustomer/Model/ResourceModel/DeleteExpiredAuthenticationData.php b/app/code/Magento/LoginAsCustomer/Model/ResourceModel/DeleteExpiredAuthenticationData.php
index d838ba88b7d50..8778c20ab9257 100644
--- a/app/code/Magento/LoginAsCustomer/Model/ResourceModel/DeleteExpiredAuthenticationData.php
+++ b/app/code/Magento/LoginAsCustomer/Model/ResourceModel/DeleteExpiredAuthenticationData.php
@@ -50,20 +50,15 @@ public function __construct(
     /**
      * @inheritdoc
      */
-    public function execute(): void
+    public function execute(int $userId): void
     {
         $connection = $this->resourceConnection->getConnection();
         $tableName = $this->resourceConnection->getTableName('login_as_customer');
 
-        $timePoint = date(
-            'Y-m-d H:i:s',
-            $this->dateTime->gmtTimestamp() - $this->config->getAuthenticationDataExpirationTime()
-        );
-
         $connection->delete(
             $tableName,
             [
-                'created_at < ?' => $timePoint
+                'admin_id = ?' => $userId
             ]
         );
     }
diff --git a/app/code/Magento/LoginAsCustomer/Model/ResourceModel/GetAuthenticationDataBySecret.php b/app/code/Magento/LoginAsCustomer/Model/ResourceModel/GetAuthenticationDataBySecret.php
index 7580668358b5a..8951ae8f70939 100644
--- a/app/code/Magento/LoginAsCustomer/Model/ResourceModel/GetAuthenticationDataBySecret.php
+++ b/app/code/Magento/LoginAsCustomer/Model/ResourceModel/GetAuthenticationDataBySecret.php
@@ -85,8 +85,8 @@ public function execute(string $secretKey): AuthenticationDataInterface
         /** @var AuthenticationDataInterface $authenticationData */
         $authenticationData = $this->authenticationDataFactory->create(
             [
-                'customerId' => (int)$data['admin_id'],
-                'adminId' => (int)$data['customer_id'],
+                'customerId' => (int)$data['customer_id'],
+                'adminId' => (int)$data['admin_id'],
                 'extensionAttributes' => null,
             ]
         );
diff --git a/app/code/Magento/LoginAsCustomer/Model/ResourceModel/DeleteAuthenticationDataBySecret.php b/app/code/Magento/LoginAsCustomer/Model/ResourceModel/IsLoginAsCustomerSessionActive.php
similarity index 61%
rename from app/code/Magento/LoginAsCustomer/Model/ResourceModel/DeleteAuthenticationDataBySecret.php
rename to app/code/Magento/LoginAsCustomer/Model/ResourceModel/IsLoginAsCustomerSessionActive.php
index 6c12d4458ef1e..3bbba4b5e6ec4 100644
--- a/app/code/Magento/LoginAsCustomer/Model/ResourceModel/DeleteAuthenticationDataBySecret.php
+++ b/app/code/Magento/LoginAsCustomer/Model/ResourceModel/IsLoginAsCustomerSessionActive.php
@@ -8,12 +8,12 @@
 namespace Magento\LoginAsCustomer\Model\ResourceModel;
 
 use Magento\Framework\App\ResourceConnection;
-use Magento\LoginAsCustomerApi\Api\DeleteAuthenticationDataBySecretInterface;
+use Magento\LoginAsCustomerApi\Api\IsLoginAsCustomerSessionActiveInterface;
 
 /**
  * @inheritdoc
  */
-class DeleteAuthenticationDataBySecret implements DeleteAuthenticationDataBySecretInterface
+class IsLoginAsCustomerSessionActive implements IsLoginAsCustomerSessionActiveInterface
 {
     /**
      * @var ResourceConnection
@@ -32,16 +32,18 @@ public function __construct(
     /**
      * @inheritdoc
      */
-    public function execute(string $secret): void
+    public function execute(int $customerId, int $userId): bool
     {
-        $connection = $this->resourceConnection->getConnection();
         $tableName = $this->resourceConnection->getTableName('login_as_customer');
+        $connection = $this->resourceConnection->getConnection();
+
+        $query = $connection->select()
+            ->from($tableName)
+            ->where('customer_id = ?', $customerId)
+            ->where('admin_id = ?', $userId);
+
+        $result = $connection->fetchRow($query);
 
-        $connection->delete(
-            $tableName,
-            [
-                'secret = ?' => $secret
-            ]
-        );
+        return false !== $result;
     }
 }
diff --git a/app/code/Magento/LoginAsCustomer/etc/crontab.xml b/app/code/Magento/LoginAsCustomer/etc/crontab.xml
deleted file mode 100644
index eaeef8cf8d759..0000000000000
--- a/app/code/Magento/LoginAsCustomer/etc/crontab.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" ?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
- -->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Cron:etc/crontab.xsd">
-    <group id="default">
-        <job instance="Magento\LoginAsCustomer\Cron\DeleteExpiredAuthenticationData"
-             method="execute"
-             name="login_as_customer_delete_expired_authentication_data">
-            <schedule>15 * * * *</schedule>
-        </job>
-    </group>
-</config>
diff --git a/app/code/Magento/LoginAsCustomer/etc/di.xml b/app/code/Magento/LoginAsCustomer/etc/di.xml
index 764e2cbd792e7..76602534d31e8 100755
--- a/app/code/Magento/LoginAsCustomer/etc/di.xml
+++ b/app/code/Magento/LoginAsCustomer/etc/di.xml
@@ -13,4 +13,5 @@
     <preference for="Magento\LoginAsCustomerApi\Api\DeleteAuthenticationDataBySecretInterface" type="Magento\LoginAsCustomer\Model\ResourceModel\DeleteAuthenticationDataBySecret"/>
     <preference for="Magento\LoginAsCustomerApi\Api\DeleteExpiredAuthenticationDataInterface" type="Magento\LoginAsCustomer\Model\ResourceModel\DeleteExpiredAuthenticationData"/>
     <preference for="Magento\LoginAsCustomerApi\Api\ConfigInterface" type="Magento\LoginAsCustomer\Model\Config"/>
+    <preference for="Magento\LoginAsCustomerApi\Api\IsLoginAsCustomerSessionActiveInterface" type="Magento\LoginAsCustomer\Model\ResourceModel\IsLoginAsCustomerSessionActive"/>
 </config>
diff --git a/app/code/Magento/LoginAsCustomerApi/Api/DeleteExpiredAuthenticationDataInterface.php b/app/code/Magento/LoginAsCustomerApi/Api/DeleteExpiredAuthenticationDataInterface.php
index 30783d216354b..3b2e756f40e83 100644
--- a/app/code/Magento/LoginAsCustomerApi/Api/DeleteExpiredAuthenticationDataInterface.php
+++ b/app/code/Magento/LoginAsCustomerApi/Api/DeleteExpiredAuthenticationDataInterface.php
@@ -15,9 +15,10 @@
 interface DeleteExpiredAuthenticationDataInterface
 {
     /**
-     * Delete expired authentication data
+     * Delete expired authentication data by user id.
      *
+     * @param int $userId
      * @return void
      */
-    public function execute(): void;
+    public function execute(int $userId): void;
 }
diff --git a/app/code/Magento/LoginAsCustomerApi/Api/IsLoginAsCustomerSessionActiveInterface.php b/app/code/Magento/LoginAsCustomerApi/Api/IsLoginAsCustomerSessionActiveInterface.php
new file mode 100644
index 0000000000000..30674375ed021
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerApi/Api/IsLoginAsCustomerSessionActiveInterface.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LoginAsCustomerApi\Api;
+
+/**
+ * Check if Login as Customer session is still active.
+ *
+ * @api
+ */
+interface IsLoginAsCustomerSessionActiveInterface
+{
+    /**
+     * Check if Login as Customer session is still active.
+     *
+     * @param int $customerId
+     * @param int $userId
+     * @return bool
+     */
+    public function execute(int $customerId, int $userId): bool;
+}
diff --git a/app/code/Magento/LoginAsCustomerSales/Plugin/FrontAddCommentOnOrderPlacementPlugin.php b/app/code/Magento/LoginAsCustomerSales/Plugin/FrontAddCommentOnOrderPlacementPlugin.php
index cbb804253c7bc..dc7b295f61c4d 100644
--- a/app/code/Magento/LoginAsCustomerSales/Plugin/FrontAddCommentOnOrderPlacementPlugin.php
+++ b/app/code/Magento/LoginAsCustomerSales/Plugin/FrontAddCommentOnOrderPlacementPlugin.php
@@ -12,7 +12,7 @@
 use Magento\User\Model\UserFactory;
 
 /**
- * Add comment after order placed by admin using login-as-customer.
+ * Add comment after order placed by admin using Login as Customer.
  *
  * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
@@ -41,7 +41,7 @@ public function __construct(
     }
 
     /**
-     * Add comment after order placed by admin using login-as-customer.
+     * Add comment after order placed by admin using Login as Customer.
      *
      * @param Order $subject
      * @param Order $result
diff --git a/app/code/Magento/LoginAsCustomerUi/Controller/Adminhtml/Login/Login.php b/app/code/Magento/LoginAsCustomerUi/Controller/Adminhtml/Login/Login.php
index 1496f6e4cd3c6..2235791029de5 100755
--- a/app/code/Magento/LoginAsCustomerUi/Controller/Adminhtml/Login/Login.php
+++ b/app/code/Magento/LoginAsCustomerUi/Controller/Adminhtml/Login/Login.php
@@ -22,6 +22,7 @@
 use Magento\LoginAsCustomerApi\Api\ConfigInterface;
 use Magento\LoginAsCustomerApi\Api\Data\AuthenticationDataInterface;
 use Magento\LoginAsCustomerApi\Api\Data\AuthenticationDataInterfaceFactory;
+use Magento\LoginAsCustomerApi\Api\DeleteExpiredAuthenticationDataInterface;
 use Magento\LoginAsCustomerApi\Api\SaveAuthenticationDataInterface;
 use Magento\Store\Model\StoreManagerInterface;
 
@@ -30,6 +31,8 @@
  * Generate secret key and forward to the storefront action
  *
  * This action can be executed via GET request when "Store View To Login In" is disabled, and POST when it is enabled
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Login extends Action implements HttpGetActionInterface, HttpPostActionInterface
 {
@@ -70,6 +73,11 @@ class Login extends Action implements HttpGetActionInterface, HttpPostActionInte
      */
     private $saveAuthenticationData;
 
+    /**
+     * @var DeleteExpiredAuthenticationDataInterface
+     */
+    private $deleteExpiredAuthenticationData;
+
     /**
      * @var Url
      */
@@ -83,6 +91,7 @@ class Login extends Action implements HttpGetActionInterface, HttpPostActionInte
      * @param ConfigInterface $config
      * @param AuthenticationDataInterfaceFactory $authenticationDataFactory
      * @param SaveAuthenticationDataInterface $saveAuthenticationData ,
+     * @param DeleteExpiredAuthenticationDataInterface $deleteExpiredAuthenticationData
      * @param Url $url
      */
     public function __construct(
@@ -93,6 +102,7 @@ public function __construct(
         ConfigInterface $config,
         AuthenticationDataInterfaceFactory $authenticationDataFactory,
         SaveAuthenticationDataInterface $saveAuthenticationData,
+        DeleteExpiredAuthenticationDataInterface $deleteExpiredAuthenticationData,
         Url $url
     ) {
         parent::__construct($context);
@@ -103,6 +113,7 @@ public function __construct(
         $this->config = $config;
         $this->authenticationDataFactory = $authenticationDataFactory;
         $this->saveAuthenticationData = $saveAuthenticationData;
+        $this->deleteExpiredAuthenticationData = $deleteExpiredAuthenticationData;
         $this->url = $url;
     }
 
@@ -142,15 +153,18 @@ public function execute(): ResultInterface
         }
 
         $adminUser = $this->authSession->getUser();
+        $userId = (int)$adminUser->getId();
 
         /** @var AuthenticationDataInterface $authenticationData */
         $authenticationData = $this->authenticationDataFactory->create(
             [
                 'customerId' => $customerId,
-                'adminId' => (int)$adminUser->getId(),
+                'adminId' => $userId,
                 'extensionAttributes' => null,
             ]
         );
+
+        $this->deleteExpiredAuthenticationData->execute($userId);
         $secret = $this->saveAuthenticationData->execute($authenticationData);
 
         $redirectUrl = $this->getLoginProceedRedirectUrl($secret, $storeId);
diff --git a/app/code/Magento/LoginAsCustomerUi/Controller/Login/Index.php b/app/code/Magento/LoginAsCustomerUi/Controller/Login/Index.php
index 0532846cf2535..eb9e6e0497029 100755
--- a/app/code/Magento/LoginAsCustomerUi/Controller/Login/Index.php
+++ b/app/code/Magento/LoginAsCustomerUi/Controller/Login/Index.php
@@ -18,7 +18,6 @@
 use Magento\Framework\Message\ManagerInterface;
 use Magento\LoginAsCustomerApi\Api\GetAuthenticationDataBySecretInterface;
 use Magento\LoginAsCustomerApi\Api\AuthenticateCustomerInterface;
-use Magento\LoginAsCustomerApi\Api\DeleteAuthenticationDataBySecretInterface;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -51,11 +50,6 @@ class Index implements HttpGetActionInterface
      */
     private $authenticateCustomer;
 
-    /**
-     * @var DeleteAuthenticationDataBySecretInterface
-     */
-    private $deleteAuthenticationDataBySecret;
-
     /**
      * @var ManagerInterface
      */
@@ -72,7 +66,6 @@ class Index implements HttpGetActionInterface
      * @param CustomerRepositoryInterface $customerRepository
      * @param GetAuthenticationDataBySecretInterface $getAuthenticateDataProcessor
      * @param AuthenticateCustomerInterface $authenticateCustomerProcessor
-     * @param DeleteAuthenticationDataBySecretInterface $deleteSecretProcessor
      * @param ManagerInterface $messageManager
      * @param LoggerInterface $logger
      */
@@ -82,7 +75,6 @@ public function __construct(
         CustomerRepositoryInterface $customerRepository,
         GetAuthenticationDataBySecretInterface $getAuthenticateDataProcessor,
         AuthenticateCustomerInterface $authenticateCustomerProcessor,
-        DeleteAuthenticationDataBySecretInterface $deleteSecretProcessor,
         ManagerInterface $messageManager,
         LoggerInterface $logger
     ) {
@@ -91,7 +83,6 @@ public function __construct(
         $this->customerRepository = $customerRepository;
         $this->getAuthenticationDataBySecret = $getAuthenticateDataProcessor;
         $this->authenticateCustomer = $authenticateCustomerProcessor;
-        $this->deleteAuthenticationDataBySecret = $deleteSecretProcessor;
         $this->messageManager = $messageManager;
         $this->logger = $logger;
     }
@@ -114,8 +105,6 @@ public function execute(): ResultInterface
 
             $authenticateData = $this->getAuthenticationDataBySecret->execute($secret);
 
-            $this->deleteAuthenticationDataBySecret->execute($secret);
-
             try {
                 $customer = $this->customerRepository->getById($authenticateData->getCustomerId());
             } catch (NoSuchEntityException $e) {
diff --git a/app/code/Magento/LoginAsCustomerUi/Plugin/AdminLogoutPlugin.php b/app/code/Magento/LoginAsCustomerUi/Plugin/AdminLogoutPlugin.php
new file mode 100644
index 0000000000000..ff61b9482ac17
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerUi/Plugin/AdminLogoutPlugin.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LoginAsCustomerUi\Plugin;
+
+use Magento\Backend\Model\Auth;
+use Magento\LoginAsCustomerApi\Api\ConfigInterface;
+use Magento\LoginAsCustomerApi\Api\DeleteExpiredAuthenticationDataInterface;
+
+/**
+ * Delete all Login as Customer sessions for logging out admin.
+ */
+class AdminLogoutPlugin
+{
+    /**
+     * @var ConfigInterface
+     */
+    private $config;
+
+    /**
+     * @var DeleteExpiredAuthenticationDataInterface
+     */
+    private $deleteExpiredAuthenticationData;
+
+    /**
+     * @param ConfigInterface $config
+     * @param DeleteExpiredAuthenticationDataInterface $deleteExpiredAuthenticationData
+     */
+    public function __construct(
+        ConfigInterface $config,
+        DeleteExpiredAuthenticationDataInterface $deleteExpiredAuthenticationData
+    ) {
+        $this->config = $config;
+        $this->deleteExpiredAuthenticationData = $deleteExpiredAuthenticationData;
+    }
+
+    /**
+     * Delete all Login as Customer sessions for logging out admin.
+     *
+     * @param Auth $subject
+     */
+    public function beforeLogout(Auth $subject): void
+    {
+        if ($this->config->isEnabled()) {
+            $userId = (int)$subject->getUser()->getId();
+            $this->deleteExpiredAuthenticationData->execute($userId);
+        }
+    }
+}
diff --git a/app/code/Magento/LoginAsCustomerUi/Plugin/InvalidateExpiredSessionPlugin.php b/app/code/Magento/LoginAsCustomerUi/Plugin/InvalidateExpiredSessionPlugin.php
new file mode 100644
index 0000000000000..1f80292ed2738
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerUi/Plugin/InvalidateExpiredSessionPlugin.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\LoginAsCustomerUi\Plugin;
+
+use Magento\Customer\Model\Session;
+use Magento\Framework\App\ActionInterface;
+use Magento\LoginAsCustomerApi\Api\ConfigInterface;
+use Magento\LoginAsCustomerApi\Api\IsLoginAsCustomerSessionActiveInterface;
+
+/**
+ * Invalidate expired and not active Login as Customer sessions.
+ */
+class InvalidateExpiredSessionPlugin
+{
+    /**
+     * @var ConfigInterface
+     */
+    private $config;
+
+    /**
+     * @var Session
+     */
+    private $session;
+
+    /**
+     * @var IsLoginAsCustomerSessionActiveInterface
+     */
+    private $isLoginAsCustomerSessionActive;
+
+    /**
+     * @param ConfigInterface $config
+     * @param Session $session
+     * @param IsLoginAsCustomerSessionActiveInterface $isLoginAsCustomerSessionActive
+     */
+    public function __construct(
+        ConfigInterface $config,
+        Session $session,
+        IsLoginAsCustomerSessionActiveInterface $isLoginAsCustomerSessionActive
+    ) {
+        $this->session = $session;
+        $this->isLoginAsCustomerSessionActive = $isLoginAsCustomerSessionActive;
+        $this->config = $config;
+    }
+
+    /**
+     * Invalidate expired and not active Login as Customer sessions.
+     *
+     * @param ActionInterface $subject
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function beforeExecute(ActionInterface $subject)
+    {
+        if ($this->config->isEnabled()) {
+            $adminId = (int)$this->session->getLoggedAsCustomerAdmindId();
+            $customerId = (int)$this->session->getCustomerId();
+            if ($adminId && $customerId) {
+                if (!$this->isLoginAsCustomerSessionActive->execute($customerId, $adminId)) {
+                    $this->session->destroy();
+                }
+            }
+        }
+    }
+}
diff --git a/app/code/Magento/LoginAsCustomerUi/etc/adminhtml/di.xml b/app/code/Magento/LoginAsCustomerUi/etc/adminhtml/di.xml
index ba85241397dd3..2ee0b83be573e 100644
--- a/app/code/Magento/LoginAsCustomerUi/etc/adminhtml/di.xml
+++ b/app/code/Magento/LoginAsCustomerUi/etc/adminhtml/di.xml
@@ -9,4 +9,7 @@
     <type name="Magento\Backend\Block\Widget\Button\Toolbar">
         <plugin name="login_as_customer_button_toolbar" type="Magento\LoginAsCustomerUi\Plugin\Button\ToolbarPlugin"/>
     </type>
+    <type name="Magento\Backend\Model\Auth">
+        <plugin name="login_as_customer_admin_logout" type="Magento\LoginAsCustomerUi\Plugin\AdminLogoutPlugin"/>
+    </type>
 </config>
diff --git a/app/code/Magento/LoginAsCustomerUi/etc/frontend/di.xml b/app/code/Magento/LoginAsCustomerUi/etc/frontend/di.xml
index b102505de49f8..746e908234edc 100755
--- a/app/code/Magento/LoginAsCustomerUi/etc/frontend/di.xml
+++ b/app/code/Magento/LoginAsCustomerUi/etc/frontend/di.xml
@@ -13,4 +13,8 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\App\ActionInterface">
+        <plugin name="invalidate_expired_session_plugin"
+                type="Magento\LoginAsCustomerUi\Plugin\InvalidateExpiredSessionPlugin"/>
+    </type>
 </config>