diff --git a/backend/database/models.py b/backend/database/models.py
index c5b488d..c54a982 100644
--- a/backend/database/models.py
+++ b/backend/database/models.py
@@ -762,10 +762,10 @@ class Trade:
             pass
         
         if start_timestamp is not None:
-            query += " AND entry_time >= %s"
+            query += " AND COALESCE(exit_time, entry_time) >= %s"
             params.append(start_timestamp)
         if end_timestamp is not None:
-            query += " AND entry_time <= %s"
+            query += " AND COALESCE(exit_time, entry_time) <= %s"
             params.append(end_timestamp)
         if symbol:
             query += " AND symbol = %s"