diff --git a/app/code/Magento/LoginAsCustomer/Plugin/AdminAddCommentOnOrderPlacementPlugin.php b/app/code/Magento/LoginAsCustomer/Plugin/AdminAddCommentOnOrderPlacementPlugin.php
index e87e5553ef4c8..da6cbd4ef706b 100644
--- a/app/code/Magento/LoginAsCustomer/Plugin/AdminAddCommentOnOrderPlacementPlugin.php
+++ b/app/code/Magento/LoginAsCustomer/Plugin/AdminAddCommentOnOrderPlacementPlugin.php
@@ -39,16 +39,18 @@ public function __construct(
     public function afterPlace(Order $subject, Order $result): Order
     {
         $adminUser = $this->userSession->getUser();
-        $subject->addCommentToStatusHistory(
-            'Order Placed by Store Administrator',
-            false,
-            true
-        )->setIsCustomerNotified(false);
-        $subject->addCommentToStatusHistory(
-            "Order Placed by {$adminUser->getFirstName()} {$adminUser->getLastName()} using Admin Panel",
-            false,
-            false
-        )->setIsCustomerNotified(false);
+        if ($adminUser) {
+            $subject->addCommentToStatusHistory(
+                'Order Placed by Store Administrator',
+                false,
+                true
+            )->setIsCustomerNotified(false);
+            $subject->addCommentToStatusHistory(
+                "Order Placed by {$adminUser->getFirstName()} {$adminUser->getLastName()} using Admin Panel",
+                false,
+                false
+            )->setIsCustomerNotified(false);
+        }
 
         return $result;
     }
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php
index bdcb56e913852..b1a8d8e685226 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Sales\Model\AdminOrder;
 
-use Magento\Backend\Model\Auth;
 use Magento\Backend\Model\Session\Quote as SessionQuote;
 use Magento\Customer\Api\AddressRepositoryInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface;
@@ -43,21 +42,11 @@ class CreateTest extends \PHPUnit\Framework\TestCase
      */
     private $objectManager;
 
-    /**
-     * @var Auth
-     */
-    private $auth;
-
     protected function setUp()
     {
         $this->objectManager = Bootstrap::getObjectManager();
         $this->messageManager = $this->objectManager->get(ManagerInterface::class);
         $this->model =$this->objectManager->create(Create::class, ['messageManager' => $this->messageManager]);
-        $this->auth = $this->objectManager->create(Auth::class);
-        $this->auth->login(
-            \Magento\TestFramework\Bootstrap::ADMIN_NAME,
-            \Magento\TestFramework\Bootstrap::ADMIN_PASSWORD
-        );
     }
 
     /**