diff --git a/crates/nu-cli/src/completions/custom_completions.rs b/crates/nu-cli/src/completions/custom_completions.rs
index 317c865de1..32f088db52 100644
--- a/crates/nu-cli/src/completions/custom_completions.rs
+++ b/crates/nu-cli/src/completions/custom_completions.rs
@@ -5,7 +5,7 @@ use nu_engine::eval_call;
 use nu_protocol::{
     ast::{Argument, Call, Expr, Expression},
     debugger::WithoutDebug,
-    engine::{Stack, StateWorkingSet},
+    engine::{EngineState, Stack, StateWorkingSet},
     DeclId, PipelineData, Span, Type, Value,
 };
 use std::collections::HashMap;
@@ -42,28 +42,37 @@ impl<T: Completer> Completer for CustomCompletion<T> {
     ) -> Vec<SemanticSuggestion> {
         // Call custom declaration
         let mut stack_mut = stack.clone();
-        let result = eval_call::<WithoutDebug>(
-            working_set.permanent_state,
-            &mut stack_mut,
-            &Call {
-                decl_id: self.decl_id,
-                head: span,
-                arguments: vec![
-                    Argument::Positional(Expression::new_unknown(
-                        Expr::String(self.line.clone()),
-                        Span::unknown(),
-                        Type::String,
-                    )),
-                    Argument::Positional(Expression::new_unknown(
-                        Expr::Int(self.line_pos as i64),
-                        Span::unknown(),
-                        Type::Int,
-                    )),
-                ],
-                parser_info: HashMap::new(),
-            },
-            PipelineData::empty(),
-        );
+        let mut eval = |engine_state: &EngineState| {
+            eval_call::<WithoutDebug>(
+                engine_state,
+                &mut stack_mut,
+                &Call {
+                    decl_id: self.decl_id,
+                    head: span,
+                    arguments: vec![
+                        Argument::Positional(Expression::new_unknown(
+                            Expr::String(self.line.clone()),
+                            Span::unknown(),
+                            Type::String,
+                        )),
+                        Argument::Positional(Expression::new_unknown(
+                            Expr::Int(self.line_pos as i64),
+                            Span::unknown(),
+                            Type::Int,
+                        )),
+                    ],
+                    parser_info: HashMap::new(),
+                },
+                PipelineData::empty(),
+            )
+        };
+        let result = if self.decl_id.get() < working_set.permanent_state.num_decls() {
+            eval(working_set.permanent_state)
+        } else {
+            let mut engine_state = working_set.permanent_state.clone();
+            let _ = engine_state.merge_delta(working_set.delta.clone());
+            eval(&engine_state)
+        };
 
         let mut completion_options = orig_options.clone();
         let mut should_sort = true;
diff --git a/crates/nu-cli/tests/completions/mod.rs b/crates/nu-cli/tests/completions/mod.rs
index 0326c9ba84..4e1e5b0fdb 100644
--- a/crates/nu-cli/tests/completions/mod.rs
+++ b/crates/nu-cli/tests/completions/mod.rs
@@ -350,6 +350,21 @@ fn custom_arguments_vs_subcommands() {
     match_suggestions(&expected, &suggestions);
 }
 
+#[test]
+fn custom_completions_defined_inline() {
+    let (_, _, engine, stack) = new_engine();
+
+    let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
+    let completion_str = "def animals [] { [cat dog] }
+export def say [
+  animal: string@animals
+] { }; say ";
+    let suggestions = completer.complete(completion_str, completion_str.len());
+    // including only subcommand completions
+    let expected: Vec<_> = vec!["cat", "dog"];
+    match_suggestions(&expected, &suggestions);
+}
+
 /// External command only if starts with `^`
 #[test]
 fn external_commands_only() {