diff --git a/src/Init/Lean/Elab/Binders.lean b/src/Init/Lean/Elab/Binders.lean
index 20f39d6251..f671e5e86c 100644
--- a/src/Init/Lean/Elab/Binders.lean
+++ b/src/Init/Lean/Elab/Binders.lean
@@ -281,6 +281,13 @@ structure State :=
 (expectedType? : Option Expr := none)
 (explicit      : Bool := false)
 
+private def checkNoOptAutoParam (ref : Syntax) (type : Expr) : TermElabM Unit := do
+type ← instantiateMVars ref type;
+when type.isOptParam $
+  throwError ref "optParam is not allowed at 'fun/λ' binders";
+when type.isAutoParam $
+  throwError ref "autoParam is not allowed at 'fun/λ' binders"
+
 private def propagateExpectedType (ref : Syntax) (fvar : Expr) (fvarType : Expr) (s : State) : TermElabM State := do
 match s.expectedType? with
 | none              => pure s
@@ -289,6 +296,7 @@ match s.expectedType? with
   match expectedType with
   | Expr.forallE _ d b _ => do
     isDefEq ref fvarType d;
+    checkNoOptAutoParam ref fvarType;
     let b := b.instantiate1 fvar;
     pure { expectedType? := some b, .. s }
   | _ => pure { expectedType? := none, .. s }
@@ -301,6 +309,7 @@ private partial def elabFunBinderViews (binderViews : Array BinderView) : Nat 
       /- As soon as we find an explicit binder, we switch to `explict := true` mode. -/
       let s     := if binderView.bi.isExplicit then { explicit := true, .. s } else s;
       type       ← elabType binderView.type;
+      checkNoOptAutoParam binderView.type type;
       fvarId ← mkFreshFVarId;
       let fvar  := mkFVar fvarId;
       let s     := { fvars := s.fvars.push fvar, .. s };
diff --git a/tests/lean/run/newfrontend5.lean b/tests/lean/run/newfrontend5.lean
index 63b6e42eb5..841466c05d 100644
--- a/tests/lean/run/newfrontend5.lean
+++ b/tests/lean/run/newfrontend5.lean
@@ -50,3 +50,13 @@ set_option pp.all true
 #check let x := (fun f => (f, f)) @id; (x.1 (), x.2 true) -- works
 #check_failure let x := (fun f => (f, f)) id; (x.1 (), x.2 true) -- fails as expected
 #check let x := (fun (f : {α : Type} → α → α) => (f, f)) @id; (x.1 (), x.2 true) -- works
+
+set_option pp.all false
+set_option pp.implicit true
+
+def h (x := 10) (y := 20) : Nat := x + y
+#check h -- h 10 20 : Nat
+#check let f := @h; f -- (let f : optParam Nat 10 → optParam Nat 20 → Nat := @h; f 10 20) : Nat
+
+#check_failure let f := fun (x : optParam Nat 10) => x + 1; f + f 1
+#check_failure (fun (x : optParam Nat 10) => x)