diff --git a/api/chalicelib/core/sessions.py b/api/chalicelib/core/sessions.py
index caa19db1e..7a00de9bf 100644
--- a/api/chalicelib/core/sessions.py
+++ b/api/chalicelib/core/sessions.py
@@ -562,29 +562,40 @@ def search2_pg(data: schemas.SessionsSearchPayloadSchema, project_id, user_id, f
                                         {query_part};""",
                 full_args)
         else:
-            main_query = cur.mogrify(f"""SELECT * FROM
-                                        (SELECT DISTINCT ON(s.session_id) {SESSION_PROJECTION_COLS}
-                                        {query_part}
-                                        ORDER BY s.session_id desc) AS filtred_sessions
-                                        ORDER BY favorite DESC, issue_score DESC, {sort} {order};""",
+            main_query = cur.mogrify(f"""SELECT COUNT(full_sessions) AS count, JSONB_AGG(full_sessions) FILTER (WHERE rn <= 200) AS sessions
+                                            FROM (SELECT *, ROW_NUMBER() OVER (ORDER BY favorite DESC, issue_score DESC, session_id desc, start_ts desc) AS rn FROM
+                                            (SELECT DISTINCT ON(s.session_id) {SESSION_PROJECTION_COLS}
+                                            {query_part}
+                                            ORDER BY s.session_id desc) AS filtred_sessions
+                                            ORDER BY favorite DESC, issue_score DESC, {sort} {order}) AS full_sessions;""",
                                      full_args)
 
+            # main_query = cur.mogrify(f"""SELECT * FROM
+            #                             (SELECT DISTINCT ON(s.session_id) {SESSION_PROJECTION_COLS}
+            #                             {query_part}
+            #                             ORDER BY s.session_id desc) AS filtred_sessions
+            #                             ORDER BY favorite DESC, issue_score DESC, {sort} {order};""",
+            #                          full_args)
+
         print("--------------------")
         print(main_query)
 
         cur.execute(main_query)
-
+        print("Executed--------------------")
         if count_only:
             return helper.dict_to_camel_case(cur.fetchone())
-        sessions = []
-        total = cur.rowcount
-        row = cur.fetchone()
-        limit = 200
-        while row is not None and len(sessions) < limit:
-            if row.get("favorite"):
-                limit += 1
-            sessions.append(row)
-            row = cur.fetchone()
+        sessions = cur.fetchone()
+        total = sessions["count"]
+        sessions = sessions["sessions"]
+        # sessions = []
+        # total = cur.rowcount
+        # row = cur.fetchone()
+        # limit = 200
+        # while row is not None and len(sessions) < limit:
+        #     if row.get("favorite"):
+        #         limit += 1
+        #     sessions.append(row)
+        #     row = cur.fetchone()
 
     if errors_only:
         return sessions
diff --git a/ee/scripts/helm/db/init_dbs/postgresql/1.5.0/1.5.0.sql b/ee/scripts/helm/db/init_dbs/postgresql/1.5.0/1.5.0.sql
index 5f0f4f054..eac07d08e 100644
--- a/ee/scripts/helm/db/init_dbs/postgresql/1.5.0/1.5.0.sql
+++ b/ee/scripts/helm/db/init_dbs/postgresql/1.5.0/1.5.0.sql
@@ -15,4 +15,6 @@ CREATE TABLE traces
 );
 CREATE INDEX traces_user_id_idx ON traces (user_id);
 CREATE INDEX traces_tenant_id_idx ON traces (tenant_id);
+
+CREATE INDEX user_favorite_sessions_user_id_session_id_idx ON user_favorite_sessions(user_id,session_id);
 COMMIT;
\ No newline at end of file
diff --git a/scripts/helm/db/init_dbs/postgresql/1.5.0/1.5.0.sql b/scripts/helm/db/init_dbs/postgresql/1.5.0/1.5.0.sql
new file mode 100644
index 000000000..d6a3abf83
--- /dev/null
+++ b/scripts/helm/db/init_dbs/postgresql/1.5.0/1.5.0.sql
@@ -0,0 +1,5 @@
+BEGIN;
+
+CREATE INDEX user_favorite_sessions_user_id_session_id_idx ON user_favorite_sessions (user_id, session_id);
+
+END;
\ No newline at end of file
diff --git a/scripts/helm/db/init_dbs/postgresql/init_schema.sql b/scripts/helm/db/init_dbs/postgresql/init_schema.sql
index 80b2a9135..345bf6b2c 100644
--- a/scripts/helm/db/init_dbs/postgresql/init_schema.sql
+++ b/scripts/helm/db/init_dbs/postgresql/init_schema.sql
@@ -598,7 +598,7 @@ $$
                 session_id bigint  NOT NULL REFERENCES sessions (session_id) ON DELETE CASCADE,
                 PRIMARY KEY (user_id, session_id)
             );
-
+            CREATE INDEX user_favorite_sessions_user_id_session_id_idx ON user_favorite_sessions (user_id, session_id);
 
 -- --- assignments.sql ---