diff --git a/README.md b/README.md
index dd97f519a2..4e09ad61ee 100644
--- a/README.md
+++ b/README.md
@@ -3,11 +3,11 @@
 **Donate Link:** http://tareq.co/donate/  
 **Tags:** WooCommerce multivendor marketplace, multi vendor marketplace, multi seller store, multi-vendor, multi seller, commissions, multivendor, marketplace, product vendors, woocommerce vendor, commission rate, e-commerce, woocommerce, ebay, ecommerce.  
 **Requires at least:** 5.6  
-**Tested up to:** 6.4.1  
+**Tested up to:** 6.4.2  
 **WC requires at least:** 5.0.0  
 **WC tested up to:** 8.2.2  
 **Requires PHP:** 7.3  
-**Stable tag:** 3.9.3  
+**Stable tag:** 3.9.4  
 **License:** GPLv2 or later  
 **License URI:** http://www.gnu.org/licenses/gpl-2.0.html  
 
@@ -338,6 +338,11 @@ A. Just install and activate the PRO version without deleting the free plugin. A
 
 ## Changelog ##
 
+### v3.9.4 ( Dec 12, 2023 ) ###
+
+**fix:** Fixed an issue where the Vendor class shop_data persistence is broken on save()
+**fix:** Fixed a fatal error while trying to edit a subscription under WordPress Admin Panel → WooCommerce → Subscription menu of the WooCommerce Subscription Plugin.
+
 ### v3.9.3 ( Nov 30, 2023 ) ###
 
 - **fix:** Fixed an issue where the Tab fields under the product Add/Edit page don’t display predefined tags until users start typing to select tags.
diff --git a/dokan.php b/dokan.php
index 503d542a6a..ff08ce1aa6 100755
--- a/dokan.php
+++ b/dokan.php
@@ -3,7 +3,7 @@
  * Plugin Name: Dokan
  * Plugin URI: https://dokan.co/wordpress/
  * Description: An e-commerce marketplace plugin for WordPress. Powered by WooCommerce and weDevs.
- * Version: 3.9.3
+ * Version: 3.9.4
  * Author: weDevs
  * Author URI: https://dokan.co/
  * Text Domain: dokan-lite
@@ -63,7 +63,7 @@ final class WeDevs_Dokan {
      *
      * @var string
      */
-    public $version = '3.9.3';
+    public $version = '3.9.4';
 
     /**
      * Instance of self
diff --git a/includes/Order/Admin/Hooks.php b/includes/Order/Admin/Hooks.php
index fafaa010d5..ba08b1a81d 100644
--- a/includes/Order/Admin/Hooks.php
+++ b/includes/Order/Admin/Hooks.php
@@ -181,7 +181,7 @@ public function admin_shop_order_row_classes( $classes, $class, $post_id ) {
             return $classes;
         }
 
-        if ( is_search() || ! current_user_can( 'manage_woocommerce' ) ) {
+        if ( ! is_admin() || ! current_user_can( 'manage_woocommerce' ) ) {
             return $classes;
         }
 
@@ -212,7 +212,11 @@ public function admin_shop_order_row_classes( $classes, $class, $post_id ) {
      */
     public function admin_shop_order_scripts() {
         $current_screen = get_current_screen();
-        if ( $current_screen && OrderUtil::get_order_admin_screen() !== $current_screen->base ) {
+        if ( ! $current_screen ) {
+            return;
+        }
+
+        if ( ( 'edit' === $current_screen->base && 'shop_order' !== $current_screen->post_type ) && OrderUtil::get_order_admin_screen() !== $current_screen->base ) {
             return;
         }
         ?>
diff --git a/languages/dokan-lite.pot b/languages/dokan-lite.pot
index 48562fc32c..fea997f95e 100644
--- a/languages/dokan-lite.pot
+++ b/languages/dokan-lite.pot
@@ -1,14 +1,14 @@
 # Copyright (c) 2023 weDevs Pte. Ltd. All Rights Reserved.
 msgid ""
 msgstr ""
-"Project-Id-Version: Dokan 3.9.3\n"
+"Project-Id-Version: Dokan 3.9.4\n"
 "Report-Msgid-Bugs-To: https://dokan.co/contact/\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2023-11-30T05:03:49+00:00\n"
+"POT-Creation-Date: 2023-12-12T04:56:32+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.8.1\n"
 "X-Domain: dokan-lite\n"
@@ -552,7 +552,7 @@ msgstr ""
 #: includes/Admin/Settings.php:378
 #: includes/Admin/SetupWizard.php:551
 #: includes/Dashboard/Templates/Dashboard.php:96
-#: includes/Order/functions.php:417
+#: includes/Order/functions.php:420
 #: templates/dashboard/orders-widget.php:25
 msgid "Completed"
 msgstr ""
@@ -560,14 +560,14 @@ msgstr ""
 #: includes/Admin/Settings.php:379
 #: includes/Admin/SetupWizard.php:558
 #: includes/Dashboard/Templates/Dashboard.php:106
-#: includes/Order/functions.php:432
+#: includes/Order/functions.php:435
 #: templates/dashboard/orders-widget.php:35
 #: templates/orders/listing.php:132
 msgid "Processing"
 msgstr ""
 
 #: includes/Admin/Settings.php:380
-#: includes/Order/functions.php:427
+#: includes/Order/functions.php:430
 msgid "On-hold"
 msgstr ""
 
@@ -2568,14 +2568,14 @@ msgid "Pending"
 msgstr ""
 
 #: includes/Dashboard/Templates/Dashboard.php:111
-#: includes/Order/functions.php:442
+#: includes/Order/functions.php:445
 #: templates/dashboard/orders-widget.php:40
 #: assets/js/vue-admin.js:2
 msgid "Cancelled"
 msgstr ""
 
 #: includes/Dashboard/Templates/Dashboard.php:116
-#: includes/Order/functions.php:437
+#: includes/Order/functions.php:440
 #: templates/dashboard/orders-widget.php:45
 msgid "Refunded"
 msgstr ""
@@ -3264,7 +3264,7 @@ msgid "Online"
 msgstr ""
 
 #: includes/functions.php:775
-#: includes/Order/functions.php:451
+#: includes/Order/functions.php:454
 msgid "Draft"
 msgstr ""
 
@@ -3804,147 +3804,147 @@ msgstr ""
 msgid "Your {site_title} order from {order_date} is complete"
 msgstr ""
 
-#: includes/Order/functions.php:422
+#: includes/Order/functions.php:425
 msgid "Pending Payment"
 msgstr ""
 
-#: includes/Order/functions.php:447
+#: includes/Order/functions.php:450
 msgid "Failed"
 msgstr ""
 
-#: includes/Order/functions.php:633
+#: includes/Order/functions.php:636
 msgid "Order No"
 msgstr ""
 
-#: includes/Order/functions.php:634
+#: includes/Order/functions.php:637
 #: templates/orders/details.php:19
 msgid "Order Items"
 msgstr ""
 
-#: includes/Order/functions.php:635
+#: includes/Order/functions.php:638
 msgid "Shipping method"
 msgstr ""
 
-#: includes/Order/functions.php:636
+#: includes/Order/functions.php:639
 msgid "Shipping Cost"
 msgstr ""
 
-#: includes/Order/functions.php:637
+#: includes/Order/functions.php:640
 msgid "Payment method"
 msgstr ""
 
-#: includes/Order/functions.php:638
+#: includes/Order/functions.php:641
 #: templates/orders/listing.php:31
 #: templates/orders/listing.php:77
 msgid "Order Total"
 msgstr ""
 
-#: includes/Order/functions.php:639
+#: includes/Order/functions.php:642
 msgid "Earnings"
 msgstr ""
 
-#: includes/Order/functions.php:640
+#: includes/Order/functions.php:643
 #: includes/REST/OrderController.php:107
 msgid "Order Status"
 msgstr ""
 
-#: includes/Order/functions.php:641
+#: includes/Order/functions.php:644
 msgid "Order Date"
 msgstr ""
 
-#: includes/Order/functions.php:642
+#: includes/Order/functions.php:645
 msgid "Billing Company"
 msgstr ""
 
-#: includes/Order/functions.php:643
+#: includes/Order/functions.php:646
 msgid "Billing First Name"
 msgstr ""
 
-#: includes/Order/functions.php:644
+#: includes/Order/functions.php:647
 msgid "Billing Last Name"
 msgstr ""
 
-#: includes/Order/functions.php:645
+#: includes/Order/functions.php:648
 msgid "Billing Full Name"
 msgstr ""
 
-#: includes/Order/functions.php:646
+#: includes/Order/functions.php:649
 msgid "Billing Email"
 msgstr ""
 
-#: includes/Order/functions.php:647
+#: includes/Order/functions.php:650
 msgid "Billing Phone"
 msgstr ""
 
-#: includes/Order/functions.php:648
+#: includes/Order/functions.php:651
 msgid "Billing Address 1"
 msgstr ""
 
-#: includes/Order/functions.php:649
+#: includes/Order/functions.php:652
 msgid "Billing Address 2"
 msgstr ""
 
-#: includes/Order/functions.php:650
+#: includes/Order/functions.php:653
 msgid "Billing City"
 msgstr ""
 
-#: includes/Order/functions.php:651
+#: includes/Order/functions.php:654
 msgid "Billing State"
 msgstr ""
 
-#: includes/Order/functions.php:652
+#: includes/Order/functions.php:655
 msgid "Billing Postcode"
 msgstr ""
 
-#: includes/Order/functions.php:653
+#: includes/Order/functions.php:656
 msgid "Billing Country"
 msgstr ""
 
-#: includes/Order/functions.php:654
+#: includes/Order/functions.php:657
 msgid "Shipping Company"
 msgstr ""
 
-#: includes/Order/functions.php:655
+#: includes/Order/functions.php:658
 msgid "Shipping First Name"
 msgstr ""
 
-#: includes/Order/functions.php:656
+#: includes/Order/functions.php:659
 msgid "Shipping Last Name"
 msgstr ""
 
-#: includes/Order/functions.php:657
+#: includes/Order/functions.php:660
 msgid "Shipping Full Name"
 msgstr ""
 
-#: includes/Order/functions.php:658
+#: includes/Order/functions.php:661
 msgid "Shipping Address 1"
 msgstr ""
 
-#: includes/Order/functions.php:659
+#: includes/Order/functions.php:662
 msgid "Shipping Address 2"
 msgstr ""
 
-#: includes/Order/functions.php:660
+#: includes/Order/functions.php:663
 msgid "Shipping City"
 msgstr ""
 
-#: includes/Order/functions.php:661
+#: includes/Order/functions.php:664
 msgid "Shipping State"
 msgstr ""
 
-#: includes/Order/functions.php:662
+#: includes/Order/functions.php:665
 msgid "Shipping Postcode"
 msgstr ""
 
-#: includes/Order/functions.php:663
+#: includes/Order/functions.php:666
 msgid "Shipping Country"
 msgstr ""
 
-#: includes/Order/functions.php:664
+#: includes/Order/functions.php:667
 msgid "Customer IP"
 msgstr ""
 
-#: includes/Order/functions.php:665
+#: includes/Order/functions.php:668
 msgid "Customer Note"
 msgstr ""
 
@@ -7207,26 +7207,26 @@ msgstr ""
 msgid "Switched back to %1$s (%2$s)."
 msgstr ""
 
-#: includes/Vendor/Vendor.php:924
+#: includes/Vendor/Vendor.php:925
 msgid "No ratings found yet!"
 msgstr ""
 
-#: includes/Vendor/Vendor.php:926
+#: includes/Vendor/Vendor.php:927
 msgid "%s rating from %d review"
 msgid_plural "%s rating from %d reviews"
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/Vendor/Vendor.php:927
+#: includes/Vendor/Vendor.php:928
 msgid "Rated %s out of %d"
 msgstr ""
 
-#: includes/Vendor/Vendor.php:1038
+#: includes/Vendor/Vendor.php:1039
 #: templates/settings/store-form.php:252
 msgid "Store is open"
 msgstr ""
 
-#: includes/Vendor/Vendor.php:1052
+#: includes/Vendor/Vendor.php:1053
 #: templates/settings/store-form.php:260
 msgid "Store is closed"
 msgstr ""
diff --git a/package.json b/package.json
index de90de5381..751d07c9b5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dokan",
-  "version": "3.9.3",
+  "version": "3.9.4",
   "description": "A WordPress marketplace plugin",
   "author": "weDevs",
   "license": "GPL",
diff --git a/readme.txt b/readme.txt
index 517830c3ff..7a645019be 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,11 +3,11 @@ Contributors: tareq1988, wedevs, nizamuddinbabu
 Donate Link: http://tareq.co/donate/
 Tags: WooCommerce multivendor marketplace, multi vendor marketplace, multi seller store, multi-vendor, multi seller, commissions, multivendor, marketplace, product vendors, woocommerce vendor, commission rate, e-commerce, woocommerce, ebay, ecommerce.
 Requires at least: 5.6
-Tested up to: 6.4.1
+Tested up to: 6.4.2
 WC requires at least: 5.0.0
 WC tested up to: 8.2.2
 Requires PHP: 7.3
-Stable tag: 3.9.3
+Stable tag: 3.9.4
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -338,6 +338,12 @@ A. Just install and activate the PRO version without deleting the free plugin. A
 
 == Changelog ==
 
+= v3.9.4 ( Dec 12, 2023 ) =
+
+- **fix:** Fixed an issue where the Vendor class shop_data persistence is broken on save()
+- **fix:** Fixed a fatal error while trying to edit a subscription under WordPress Admin Panel → WooCommerce → Subscription menu of the WooCommerce Subscription Plugin.
+- **fix:** Toggle Sub-Orders and Show Sub-Orders buttons are not working if HPOS feature is disabled.
+
 = v3.9.3 ( Nov 30, 2023 ) =
 
 - **fix:** Fixed an issue where the Tab fields under the product Add/Edit page don’t display predefined tags until users start typing to select tags.
diff --git a/templates/whats-new.php b/templates/whats-new.php
index 4c5528eec9..a945d260bf 100644
--- a/templates/whats-new.php
+++ b/templates/whats-new.php
@@ -3,6 +3,26 @@
  * When you are adding new version please follow this sequence for changes: New Feature, New, Improvement, Fix...
  */
 $changelog = [
+    [
+        'version'  => 'Version 3.9.4',
+        'released' => '2023-12-12',
+        'changes'  => [
+            'Fix'         => [
+                [
+                    'title'       => 'Fixed an issue where the Vendor class shop_data persistence is broken on save()',
+                    'description' => '',
+                ],
+                [
+                    'title'       => 'Fixed a fatal error while trying to edit a subscription under WordPress Admin Panel → WooCommerce → Subscription menu of the WooCommerce Subscription Plugin.',
+                    'description' => '',
+                ],
+                [
+                    'title'       => 'Toggle Sub-Orders and Show Sub-Orders buttons are not working if HPOS feature is disabled.',
+                    'description' => '',
+                ],
+            ],
+        ],
+    ],
     [
         'version'  => 'Version 3.9.3',
         'released' => '2023-11-30',