diff --git a/src/components/infrastructure/tollHouse/Form/CreateTollHouse/TollHouseInfo.jsx b/src/components/infrastructure/tollHouse/Form/CreateTollHouse/TollHouseInfo.jsx
index dc56843..5d53fdf 100644
--- a/src/components/infrastructure/tollHouse/Form/CreateTollHouse/TollHouseInfo.jsx
+++ b/src/components/infrastructure/tollHouse/Form/CreateTollHouse/TollHouseInfo.jsx
@@ -82,8 +82,8 @@ const TollHouseInfo = ({ control }) => {
                                         value={field.value}
                                         label="وضعیت"
                                         selectors={[
-                                            { id: 0, name: "فعال" },
-                                            { id: 1, name: "غیر فعال" },
+                                            { id: 1, name: "فعال" },
+                                            { id: 0, name: "غیر فعال" },
                                         ]}
                                         schema={{ name: "name", value: "id" }}
                                         error={error}
diff --git a/src/components/infrastructure/tollHouse/TollHouseList.jsx b/src/components/infrastructure/tollHouse/TollHouseList.jsx
index 4ef1674..11536b8 100644
--- a/src/components/infrastructure/tollHouse/TollHouseList.jsx
+++ b/src/components/infrastructure/tollHouse/TollHouseList.jsx
@@ -384,7 +384,8 @@ const TollHouseList = () => {
                 ],
             },
             {
-                accessorFn: (row) => moment(row.created_at).locale("fa").format("HH:mm | yyyy/MM/DD"),
+                accessorFn: (row) =>
+                    row.created_at ? moment(row.created_at).locale("fa").format("HH:mm | yyyy/MM/DD") : "-",
                 header: "تاریخ ثبت",
                 id: "created_at",
                 enableColumnFilter: true,