diff --git a/src/common/ResponsiveTable.tsx b/src/common/ResponsiveTable.tsx
index 3f637d3..cd16f01 100644
--- a/src/common/ResponsiveTable.tsx
+++ b/src/common/ResponsiveTable.tsx
@@ -387,8 +387,21 @@ export default function ResponsiveTable<T extends Object>(props: Props<T>) {
   const columnClick = (column: Column<T>) => {
     const sortKey = column.sortKey ? column.sortKey : column.title.toLowerCase()
     // console.log(column.sortKey)
-    if (setOrderBy) setOrderBy(sortKey)
-    if (setOrder && order) setOrder(order === "asc" ? "desc" : "asc")
+    if (setOrderBy) {
+      if (orderBy === sortKey && setOrder && order) {
+        console.log(order)
+        if (order === "desc") {
+          setOrder("asc")
+        } else {
+          setOrderBy("")
+        }
+        // setOrder(order === "asc" ? "desc" : "asc")
+      } else {
+        if (setOrder) setOrder("desc")
+        setOrderBy(sortKey)
+      }
+    }
+    // if (setOrder && order) setOrder(order === "asc" ? "desc" : "asc")
   }
 
   const showOrderIcon = (column: Column<T>) => {