diff --git a/core/translate/emitter.rs b/core/translate/emitter.rs
index 7c48f92ad..dd7025544 100644
--- a/core/translate/emitter.rs
+++ b/core/translate/emitter.rs
@@ -287,6 +287,7 @@ pub fn emit_query<'a>(
         program,
         t_ctx,
         &plan.table_references,
+        &mut plan.aggregates,
         OperationMode::SELECT,
     )?;
 
@@ -396,6 +397,7 @@ fn emit_program_for_delete(
         program,
         &mut t_ctx,
         &plan.table_references,
+        &mut [],
         OperationMode::DELETE,
     )?;
 
@@ -588,6 +590,7 @@ fn emit_program_for_update(
         program,
         &mut t_ctx,
         &plan.table_references,
+        &mut [],
         OperationMode::UPDATE,
     )?;
     // Open indexes for update.
diff --git a/core/translate/main_loop.rs b/core/translate/main_loop.rs
index f10523f16..a8d6bebe3 100644
--- a/core/translate/main_loop.rs
+++ b/core/translate/main_loop.rs
@@ -1,14 +1,17 @@
 use limbo_ext::VTabKind;
-use limbo_sqlite3_parser::ast;
+use limbo_sqlite3_parser::ast::{self, SortOrder};
 
 use std::sync::Arc;
 
 use crate::{
-    schema::{Index, Table},
-    translate::result_row::emit_select_result,
+    schema::{Index, IndexColumn, Table},
+    translate::{
+        plan::{AggDistinctness, DistinctAggCtx},
+        result_row::emit_select_result,
+    },
     types::SeekOp,
     vdbe::{
-        builder::ProgramBuilder,
+        builder::{CursorType, ProgramBuilder},
         insn::{CmpInsFlags, IdxInsertFlags, Insn},
         BranchOffset, CursorID,
     },
@@ -26,8 +29,8 @@ use super::{
     optimizer::Optimizable,
     order_by::{order_by_sorter_insert, sorter_insert},
     plan::{
-        convert_where_to_vtab_constraint, IterationDirection, JoinOrderMember, Operation, Search,
-        SeekDef, SelectPlan, SelectQueryType, TableReference, WhereTerm,
+        convert_where_to_vtab_constraint, Aggregate, IterationDirection, JoinOrderMember,
+        Operation, Search, SeekDef, SelectPlan, SelectQueryType, TableReference, WhereTerm,
     },
 };
 
@@ -68,12 +71,52 @@ pub fn init_loop(
     program: &mut ProgramBuilder,
     t_ctx: &mut TranslateCtx,
     tables: &[TableReference],
+    aggregates: &mut [Aggregate],
     mode: OperationMode,
 ) -> Result<()> {
     assert!(
         t_ctx.meta_left_joins.len() == tables.len(),
         "meta_left_joins length does not match tables length"
     );
+    // Initialize ephemeral indexes for distinct aggregates
+    for (i, agg) in aggregates
+        .iter_mut()
+        .enumerate()
+        .filter(|(_, agg)| agg.is_distinct())
+    {
+        assert!(
+            agg.args.len() == 1,
+            "DISTINCT aggregate functions must have exactly one argument"
+        );
+        let index_name = format!("distinct_agg_{}_{}", i, agg.args[0]);
+        let index = Arc::new(Index {
+            name: index_name.clone(),
+            table_name: String::new(),
+            ephemeral: true,
+            root_page: 0,
+            columns: vec![IndexColumn {
+                name: agg.args[0].to_string(),
+                order: SortOrder::Asc,
+                pos_in_table: 0,
+            }],
+            unique: false,
+        });
+        let cursor_id = program.alloc_cursor_id(
+            Some(index_name.clone()),
+            CursorType::BTreeIndex(index.clone()),
+        );
+        program.emit_insn(Insn::OpenEphemeral {
+            cursor_id,
+            is_table: false,
+        });
+        agg.distinctness = AggDistinctness::Distinct {
+            ctx: Some(DistinctAggCtx {
+                cursor_id,
+                ephemeral_index_name: index_name,
+                label_on_conflict: program.allocate_label(),
+            }),
+        };
+    }
     for (table_index, table) in tables.iter().enumerate() {
         // Initialize bookkeeping for OUTER JOIN
         if let Some(join_info) = table.join_info.as_ref() {