diff --git a/compiler/noirc_frontend/src/elaborator/mod.rs b/compiler/noirc_frontend/src/elaborator/mod.rs
index da35ca77316..78241ce95a4 100644
--- a/compiler/noirc_frontend/src/elaborator/mod.rs
+++ b/compiler/noirc_frontend/src/elaborator/mod.rs
@@ -1458,9 +1458,12 @@ impl<'context> Elaborator<'context> {
     /// True if we're currently within a constrained function.
     /// Defaults to `true` if the current function is unknown.
     fn in_constrained_function(&self) -> bool {
-        self.current_item.map_or(true, |id| match id {
-            DependencyId::Function(id) => !self.interner.function_modifiers(&id).is_unconstrained,
-            _ => true,
-        })
+        !self.in_comptime_context()
+            && self.current_item.map_or(true, |id| match id {
+                DependencyId::Function(id) => {
+                    !self.interner.function_modifiers(&id).is_unconstrained
+                }
+                _ => true,
+            })
     }
 }
diff --git a/noir_stdlib/src/meta/mod.nr b/noir_stdlib/src/meta/mod.nr
index beaee8e44ea..d16a8648bc2 100644
--- a/noir_stdlib/src/meta/mod.nr
+++ b/noir_stdlib/src/meta/mod.nr
@@ -45,7 +45,7 @@ pub comptime fn derive(s: StructDefinition, traits: [TraitDefinition]) -> Quoted
     result
 }
 
-unconstrained pub comptime fn derive_via(t: TraitDefinition, f: DeriveFunction) {
+pub comptime fn derive_via(t: TraitDefinition, f: DeriveFunction) {
     HANDLERS.insert(t, f);
 }
 
diff --git a/test_programs/compile_success_empty/macros_in_comptime/src/main.nr b/test_programs/compile_success_empty/macros_in_comptime/src/main.nr
index 31d08d2762d..c5cc7880112 100644
--- a/test_programs/compile_success_empty/macros_in_comptime/src/main.nr
+++ b/test_programs/compile_success_empty/macros_in_comptime/src/main.nr
@@ -13,7 +13,7 @@ fn main() {
 
 // Call a different function from the interpreter, then have the
 // elaborator switch to the middle of foo from its previous scope in main
-unconstrained comptime fn foo<let N: Field>(x: Field) {
+comptime fn foo<let N: Field>(x: Field) {
     assert(modulus_num_bits() != 0);
 
     let cond = quote { modulus_num_bits() != 0 };