diff --git a/app/http/endpoints/manage/webchatws.go b/app/http/endpoints/manage/webchatws.go
index b514011..93ae47e 100644
--- a/app/http/endpoints/manage/webchatws.go
+++ b/app/http/endpoints/manage/webchatws.go
@@ -163,7 +163,7 @@ func WebChatWs(ctx *gin.Context) {
 				contentType := discord.ApplicationJson
 
 				if exists {
-					content := fmt.Sprintf("**%s**: %s", store.Get("name").(string), data)
+					content := data
 					if len(content) > 2000 {
 						content = content[0:1999]
 					}
@@ -197,6 +197,11 @@ func WebChatWs(ctx *gin.Context) {
 					}
 
 					if !success {
+						content = fmt.Sprintf("**%s**: %s", store.Get("name").(string), data)
+						if len(content) > 2000 {
+							content = content[0:1999]
+						}
+
 						endpoint := channel.CreateMessage(int(ticket.Channel))
 						err, _ = endpoint.Request(store, &contentType, channel.CreateMessageBody{
 							Content: content,
diff --git a/public/templates/views/ticketview.tmpl b/public/templates/views/ticketview.tmpl
index f1d418e..7ec20c6 100644
--- a/public/templates/views/ticketview.tmpl
+++ b/public/templates/views/ticketview.tmpl
@@ -78,7 +78,8 @@
 
   {{if .premium}}
   <script>
-      ws = new WebSocket("wss://panel.ticketsbot.net/webchat");
+      //ws = new WebSocket("wss://panel.ticketsbot.net/webchat");
+      ws = new WebSocket("ws://localhost:3000/webchat");
 
       ws.onopen = (evt) => {
           ws.send(JSON.stringify({
diff --git a/utils/discord/endpoints.go b/utils/discord/endpoints.go
index 500201d..17413a1 100644
--- a/utils/discord/endpoints.go
+++ b/utils/discord/endpoints.go
@@ -39,7 +39,6 @@ type Endpoint struct {
 
 func (e *Endpoint) Request(store sessions.Session, contentType *ContentType, body interface{}, response interface{}) (error, *http.Response) {
 	url := BASE_URL + e.Endpoint
-
 	// Create req
 	var req *http.Request
 	var err error
diff --git a/utils/discord/endpoints/webhooks/executewebhook.go b/utils/discord/endpoints/webhooks/executewebhook.go
index cd5f113..a917921 100644
--- a/utils/discord/endpoints/webhooks/executewebhook.go
+++ b/utils/discord/endpoints/webhooks/executewebhook.go
@@ -1,6 +1,7 @@
 package webhooks
 
 import (
+	"fmt"
 	"github.com/TicketsBot/GoPanel/utils/discord"
 	"github.com/TicketsBot/GoPanel/utils/discord/objects"
 )
@@ -12,10 +13,10 @@ type ExecuteWebhookBody struct {
 	AllowedMentions objects.AllowedMention `json:"allowed_mentions"`
 }
 
-func ExecuteWebhook(url string) discord.Endpoint {
+func ExecuteWebhook(webhook string) discord.Endpoint {
 	return discord.Endpoint{
 		RequestType:       discord.POST,
 		AuthorizationType: discord.NONE,
-		Endpoint:          url,
+		Endpoint:          fmt.Sprintf("/webhooks/%s?wait=true", webhook),
 	}
 }