diff --git a/app/config.py b/app/config.py
index d6aaf465..3df7b078 100644
--- a/app/config.py
+++ b/app/config.py
@@ -138,7 +138,6 @@ FACEBOOK_CLIENT_SECRET = os.environ["FACEBOOK_CLIENT_SECRET"]
 AVATAR_URL_EXPIRATION = 3600 * 24 * 7  # 1h*24h/d*7d=1week
 
 # session key
-HIGHLIGHT_GEN_EMAIL_ID = "highlight_gen_email_id"
 MFA_USER_ID = "mfa_user_id"
 
 FLASK_PROFILER_PATH = os.environ.get("FLASK_PROFILER_PATH")
diff --git a/app/dashboard/views/custom_alias.py b/app/dashboard/views/custom_alias.py
index 09f4d25c..bf4d56f4 100644
--- a/app/dashboard/views/custom_alias.py
+++ b/app/dashboard/views/custom_alias.py
@@ -2,7 +2,6 @@ from flask import render_template, redirect, url_for, flash, request, session
 from flask_login import login_required, current_user
 
 from app.config import (
-    HIGHLIGHT_GEN_EMAIL_ID,
     DISABLE_ALIAS_SUFFIX,
     ALIAS_DOMAINS,
 )
@@ -68,9 +67,9 @@ def custom_alias():
                 db.session.commit()
                 flash(f"Alias {full_alias} has been created", "success")
 
-                session[HIGHLIGHT_GEN_EMAIL_ID] = gen_email.id
-
-                return redirect(url_for("dashboard.index"))
+                return redirect(
+                    url_for("dashboard.index", highlight_gen_email_id=gen_email.id)
+                )
         # only happen if the request has been "hacked"
         else:
             flash("something went wrong", "warning")
diff --git a/app/dashboard/views/index.py b/app/dashboard/views/index.py
index a9f8d1ff..7e23617f 100644
--- a/app/dashboard/views/index.py
+++ b/app/dashboard/views/index.py
@@ -1,10 +1,9 @@
-from flask import render_template, request, redirect, url_for, flash, session
+from flask import render_template, request, redirect, url_for, flash
 from flask_login import login_required, current_user
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import joinedload
 
 from app import email_utils
-from app.config import HIGHLIGHT_GEN_EMAIL_ID
 from app.dashboard.base import dashboard_bp
 from app.extensions import db
 from app.log import LOG
@@ -35,14 +34,10 @@ class AliasInfo:
 @dashboard_bp.route("/", methods=["GET", "POST"])
 @login_required
 def index():
-    # after creating a gen email, it's helpful to highlight it
-    highlight_gen_email_id = session.get(HIGHLIGHT_GEN_EMAIL_ID)
-
-    # reset as it should not persist
-    if highlight_gen_email_id:
-        del session[HIGHLIGHT_GEN_EMAIL_ID]
-
     query = request.args.get("query") or ""
+    highlight_gen_email_id = None
+    if request.args.get("highlight_gen_email_id"):
+        highlight_gen_email_id = int(request.args.get("highlight_gen_email_id"))
 
     # User generates a new email
     if request.method == "POST":
@@ -78,7 +73,14 @@ def index():
 
                 LOG.d("generate new email %s for user %s", gen_email, current_user)
                 flash(f"Alias {gen_email.email} has been created", "success")
-                session[HIGHLIGHT_GEN_EMAIL_ID] = gen_email.id
+
+                return redirect(
+                    url_for(
+                        "dashboard.index",
+                        highlight_gen_email_id=gen_email.id,
+                        query=query,
+                    )
+                )
             else:
                 flash(f"You need to upgrade your plan to create new alias.", "warning")
 
@@ -94,8 +96,12 @@ def index():
             else:
                 flash(f"Alias {gen_email.email} is disabled", "warning")
 
-            session[HIGHLIGHT_GEN_EMAIL_ID] = gen_email.id
             db.session.commit()
+            return redirect(
+                url_for(
+                    "dashboard.index", highlight_gen_email_id=gen_email.id, query=query
+                )
+            )
 
         elif request.form.get("form-name") == "delete-email":
             gen_email_id = request.form.get("gen-email-id")