diff --git a/includes/Admin.php b/includes/Admin.php
index 4120ed27f..c1262310b 100644
--- a/includes/Admin.php
+++ b/includes/Admin.php
@@ -12,7 +12,7 @@
 namespace SkyVerge\WooCommerce\Facebook;
 
 use SkyVerge\WooCommerce\PluginFramework\v5_10_0\SV_WC_Helper;
-use Automattic\WooCommerce\Internal\DataStores\Orders\CustomOrdersTableController;
+use Automattic\WooCommerce\Utilities\OrderUtil;
 
 defined( 'ABSPATH' ) or exit;
 
@@ -47,9 +47,7 @@ class Admin {
 	 */
 	public function __construct() {
 
-		$order_screen_id = wc_get_container()->get( CustomOrdersTableController::class )->custom_orders_table_usage_is_enabled()
-		? wc_get_page_screen_id( 'shop-order' )
-		: 'shop_order';
+		$order_screen_id = class_exists( OrderUtil::class ) ? OrderUtil::get_order_admin_screen() : 'shop_order';
 
 		$this->screen_ids = [
 			'product',
diff --git a/tests/_support/AcceptanceTester.php b/tests/_support/AcceptanceTester.php
index 12bdb1d93..20d9ac315 100644
--- a/tests/_support/AcceptanceTester.php
+++ b/tests/_support/AcceptanceTester.php
@@ -1,7 +1,7 @@
 <?php
 
 use SkyVerge\WooCommerce\Facebook;
-use Automattic\WooCommerce\Internal\DataStores\Orders\CustomOrdersTableController;
+use Automattic\WooCommerce\Utilities\OrderUtil;
 
 /**
  * Inherited Methods
@@ -198,7 +198,7 @@ public function amOnProductPage( $product_id ) {
 	 */
 	public function amOnOrdersPage() {
 
-		if ( wc_get_container()->get( CustomOrdersTableController::class )->custom_orders_table_usage_is_enabled() ) {
+		if ( class_exists( OrderUtil::class ) && OrderUtil::custom_orders_table_usage_is_enabled() ) {
 			$orders_page = 'admin.php?page=wc-orders';
 		} else {
 			$orders_page = 'edit.php?post_type=shop_order';
@@ -215,7 +215,7 @@ public function amOnOrdersPage() {
 	 */
 	public function amOnOrderPage( $order_id ) {
 
-		if ( wc_get_container()->get( CustomOrdersTableController::class )->custom_orders_table_usage_is_enabled() ) {
+		if ( class_exists( OrderUtil::class ) && OrderUtil::custom_orders_table_usage_is_enabled() ) {
 			$order_page = "admin.php?page=wc-orders&id={$order_id}&action=edit";
 		} else {
 			$order_page = "post.php?post={$order_id}&action=edit";