diff --git a/frontend/app/components/shared/SessionListContainer/components/SessionHeader/SessionHeader.tsx b/frontend/app/components/shared/SessionListContainer/components/SessionHeader/SessionHeader.tsx
index db8044a73..e991c8c31 100644
--- a/frontend/app/components/shared/SessionListContainer/components/SessionHeader/SessionHeader.tsx
+++ b/frontend/app/components/shared/SessionListContainer/components/SessionHeader/SessionHeader.tsx
@@ -55,14 +55,14 @@ function SessionHeader(props: Props) {
                 </div>
             </div>
 
-            <div className="flex items-center">
-                {!isBookmark && <SessionTags />}
+            {!isBookmark && <div className="flex items-center">
+                <SessionTags />
                 <div className="mx-4" />
                 <SelectDateRange period={period} onChange={onDateChange} right={true} />
                 <div className="mx-2" />
                 <SessionSort />
                 <SessionSettingButton />
-            </div>
+            </div>}
         </div>
     );
 }
diff --git a/frontend/app/components/shared/SessionListContainer/components/SessionSort/SessionSort.tsx b/frontend/app/components/shared/SessionListContainer/components/SessionSort/SessionSort.tsx
index 01e770310..f253f8651 100644
--- a/frontend/app/components/shared/SessionListContainer/components/SessionSort/SessionSort.tsx
+++ b/frontend/app/components/shared/SessionListContainer/components/SessionSort/SessionSort.tsx
@@ -15,7 +15,7 @@ const sortOptions = Object.entries(sortOptionsMap).map(([value, label]) => ({ va
 
 interface Props {
     filter: any;
-    options: any;
+    options?: any;
     applyFilter: (filter: any) => void;
     sort: (sort: string, sign: number) => void;
 }