diff --git a/app/TicketPage/[id]/page.jsx b/app/TicketPage/[id]/page.jsx
index 94c5ebd..86170ad 100644
--- a/app/TicketPage/[id]/page.jsx
+++ b/app/TicketPage/[id]/page.jsx
@@ -1,35 +1,31 @@
-import EditTicketForm from "@/app/(components)/EditTicketForm";
+import TicketForm from "@/app/(components)/TicketForm";
 
 const getTicketById = async (id) => {
-  try {
-    const res = await fetch(`http://localhost:3000/api/Tickets/${id}`, {
-      cache: "no-store",
-    });
+  const res = await fetch(`${process.env.BASE_URL}${id}`, {
+    cache: "no-store",
+  });
 
-    if (!res.ok) {
-      throw new Error("Failed to fetch topic");
-    }
-
-    return res.json();
-  } catch (error) {
-    console.log(error);
+  if (!res.ok) {
+    throw new Error("Failed to get ticket.");
   }
+
+  return res.json();
 };
 
-let updateTicketData = {};
 const TicketPage = async ({ params }) => {
   const EDITMODE = params.id === "new" ? false : true;
 
+  let updateTicketData = {};
+
   if (EDITMODE) {
     updateTicketData = await getTicketById(params.id);
     updateTicketData = updateTicketData.foundTicket;
   } else {
     updateTicketData = {
-      _id: "new",
+      id: "new",
     };
   }
-
-  return <EditTicketForm ticket={updateTicketData} />;
+  return <TicketForm ticket={updateTicketData} />;
 };
 
 export default TicketPage;