diff --git a/app/Http/Controllers/V1/User/TicketController.php b/app/Http/Controllers/V1/User/TicketController.php
index 3a71768..05ca915 100644
--- a/app/Http/Controllers/V1/User/TicketController.php
+++ b/app/Http/Controllers/V1/User/TicketController.php
@@ -70,7 +70,7 @@ class TicketController extends Controller
         if ($ticket->status) {
             return $this->fail([400, __('The ticket is closed and cannot be replied')]);
         }
-        if ($request->user()->id == $this->getLastMessage($ticket->id)->user_id) {
+        if ((int) admin_setting('ticket_must_wait_reply', 0) && $request->user()->id == $this->getLastMessage($ticket->id)->user_id) {
             return $this->fail(codeResponse: [400, __('Please wait for the technical enginneer to reply')]);
         }
         $ticketService = new TicketService();
diff --git a/app/Http/Controllers/V2/Admin/ConfigController.php b/app/Http/Controllers/V2/Admin/ConfigController.php
index 3bb3b18..4923874 100644
--- a/app/Http/Controllers/V2/Admin/ConfigController.php
+++ b/app/Http/Controllers/V2/Admin/ConfigController.php
@@ -116,6 +116,7 @@ class ConfigController extends Controller
                 'tos_url' => admin_setting('tos_url'),
                 'currency' => admin_setting('currency', 'CNY'),
                 'currency_symbol' => admin_setting('currency_symbol', '¥'),
+                'ticket_must_wait_reply' => (bool) admin_setting('ticket_must_wait_reply', 0),
             ],
             'subscribe' => [
                 'plan_change_enable' => (bool) admin_setting('plan_change_enable', 1),
diff --git a/app/Http/Requests/Admin/ConfigSave.php b/app/Http/Requests/Admin/ConfigSave.php
index 5910421..49d6a63 100755
--- a/app/Http/Requests/Admin/ConfigSave.php
+++ b/app/Http/Requests/Admin/ConfigSave.php
@@ -35,6 +35,7 @@ class ConfigSave extends FormRequest
         'tos_url' => 'nullable|url',
         'currency' => '',
         'currency_symbol' => '',
+        'ticket_must_wait_reply' => '',
         // subscribe
         'plan_change_enable' => '',
         'reset_traffic_method' => 'in:0,1,2,3,4',
diff --git a/public/assets/admin b/public/assets/admin
index 86a5f20..6a48a43 160000
--- a/public/assets/admin
+++ b/public/assets/admin
@@ -1 +1 @@
-Subproject commit 86a5f20d8aba58e2686ea65faabd4f9bafe370dd
+Subproject commit 6a48a43374f9f8035329a4ba87af957edf26e6f9