diff --git a/src/khoj/database/admin.py b/src/khoj/database/admin.py
index 97a0f3ed..00e065e5 100644
--- a/src/khoj/database/admin.py
+++ b/src/khoj/database/admin.py
@@ -53,11 +53,20 @@ admin.site.register(ReflectiveQuestion)
 admin.site.register(UserSearchModelConfig)
 admin.site.register(TextToImageModelConfig)
 admin.site.register(ClientApplication)
-admin.site.register(Agent)
 admin.site.register(GithubConfig)
 admin.site.register(NotionConfig)
 
 
+@admin.register(Agent)
+class AgentAdmin(admin.ModelAdmin):
+    list_display = (
+        "id",
+        "name",
+    )
+    search_fields = ("id", "name")
+    ordering = ("-created_at",)
+
+
 @admin.register(Entry)
 class EntryAdmin(admin.ModelAdmin):
     list_display = (
@@ -85,6 +94,7 @@ class ConversationAdmin(admin.ModelAdmin):
         "client",
     )
     search_fields = ("id", "user__email", "user__username", "client__name")
+    list_filter = ("agent",)
     ordering = ("-created_at",)
 
     actions = ["export_selected_objects", "export_selected_minimal_objects"]