diff --git a/llvm/lib/Target/RISCV/RISCVExpandPseudoInsts.cpp b/llvm/lib/Target/RISCV/RISCVExpandPseudoInsts.cpp
index 95a37335aabd..49338ecb9c28 100644
--- a/llvm/lib/Target/RISCV/RISCVExpandPseudoInsts.cpp
+++ b/llvm/lib/Target/RISCV/RISCVExpandPseudoInsts.cpp
@@ -240,7 +240,8 @@ MachineBasicBlock *RISCVExpandPseudo::insertLoadOfImportTable(
   const StringRef ImportName = Fn->getName();
   // We can hit this code path if we need to do a library-style import
   // for a local exported function.
-  const bool IsLibrary = Fn->getCallingConv() == CallingConv::CHERI_LibCall;
+  CallingConv::ID CC = Fn->getCallingConv();
+  bool IsLibrary = CC == CallingConv::CHERI_LibCall;
   const StringRef CompartmentName =
       IsLibrary ? "libcalls"
                 : Fn->getFnAttribute("cheri-compartment").getValueAsString();
@@ -572,7 +573,8 @@ bool RISCVExpandPseudo::expandCapLoadLocalCap(
     if ((getInterruptStatus(*Fn) != Interrupts::Inherit) ||
         (CC == CallingConv::CHERI_CCall) ||
         (CC == CallingConv::CHERI_CCallee)) {
-      insertLoadOfImportTable(MBB, MBBI, Fn, MBBI->getOperand(0).getReg());
+      insertLoadOfImportTable(MBB, MBBI, Fn, MBBI->getOperand(0).getReg(),
+        /*TreatAsLibrary*/CC == CallingConv::C);
       NextMBBI = MBB.end();
       MBBI->eraseFromParent();
       return true;
diff --git a/llvm/test/CodeGen/RISCV/cheri/cheri-local-libcall.ll b/llvm/test/CodeGen/RISCV/cheri/cheri-local-libcall.ll
new file mode 100644
index 000000000000..bd3bb5cc6f72
--- /dev/null
+++ b/llvm/test/CodeGen/RISCV/cheri/cheri-local-libcall.ll
@@ -0,0 +1,44 @@
+; RUN: llc --filetype=asm --mcpu=cheriot --mtriple=riscv32-unknown-unknown -target-abi cheriot -mattr=+xcheri,+cap-mode < %s | FileCheck %s
+target datalayout = "e-m:e-pf200:64:64:64:32-p:32:32-i64:64-n32-S128-A200-P200-G200"
+target triple = "riscv32cheriot-unknown-cheriotrtos"
+
+@f = dso_local local_unnamed_addr addrspace(200) global ptr addrspace(200) null, align 8
+
+define dso_local void @_Z11id_functionv() addrspace(200) #0 {
+entry:
+  ret void
+}
+
+define dso_local chericcallcce void @_Z9say_hellov() local_unnamed_addr addrspace(200) #1 {
+entry:
+  store ptr addrspace(200) @_Z11id_functionv, ptr addrspace(200) @f, align 8
+  ret void
+}
+
+attributes #0 = { minsize mustprogress nofree norecurse nosync nounwind optsize willreturn memory(none) "cheri-compartment"="hello" "interrupt-state"="disabled" "no-builtins" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="cheriot" "target-features"="+32bit,+c,+cap-mode,+e,+m,+relax,+xcheri,-a,-d,-experimental-smaia,-experimental-ssaia,-experimental-zacas,-experimental-zfa,-experimental-zfbfmin,-experimental-zicond,-experimental-zihintntl,-experimental-ztso,-experimental-zvbb,-experimental-zvbc,-experimental-zvfbfmin,-experimental-zvfbfwma,-experimental-zvkg,-experimental-zvkn,-experimental-zvknc,-experimental-zvkned,-experimental-zvkng,-experimental-zvknha,-experimental-zvknhb,-experimental-zvks,-experimental-zvksc,-experimental-zvksed,-experimental-zvksg,-experimental-zvksh,-experimental-zvkt,-f,-h,-save-restore,-svinval,-svnapot,-svpbmt,-v,-xcvbitmanip,-xcvmac,-xsfcie,-xsfvcp,-xtheadba,-xtheadbb,-xtheadbs,-xtheadcmo,-xtheadcondmov,-xtheadfmemidx,-xtheadmac,-xtheadmemidx,-xtheadmempair,-xtheadsync,-xtheadvdot,-xventanacondops,-zawrs,-zba,-zbb,-zbc,-zbkb,-zbkc,-zbkx,-zbs,-zca,-zcb,-zcd,-zce,-zcf,-zcmp,-zcmt,-zdinx,-zfh,-zfhmin,-zfinx,-zhinx,-zhinxmin,-zicbom,-zicbop,-zicboz,-zicntr,-zicsr,-zifencei,-zihintpause,-zihpm,-zk,-zkn,-zknd,-zkne,-zknh,-zkr,-zks,-zksed,-zksh,-zkt,-zmmul,-zve32f,-zve32x,-zve64d,-zve64f,-zve64x,-zvfh,-zvl1024b,-zvl128b,-zvl16384b,-zvl2048b,-zvl256b,-zvl32768b,-zvl32b,-zvl4096b,-zvl512b,-zvl64b,-zvl65536b,-zvl8192b" }
+attributes #1 = { minsize mustprogress nofree norecurse nosync nounwind optsize willreturn memory(write, argmem: none, inaccessiblemem: none) "cheri-compartment"="hello" "interrupt-state"="enabled" "no-builtins" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="cheriot" "target-features"="+32bit,+c,+cap-mode,+e,+m,+relax,+xcheri,-a,-d,-experimental-smaia,-experimental-ssaia,-experimental-zacas,-experimental-zfa,-experimental-zfbfmin,-experimental-zicond,-experimental-zihintntl,-experimental-ztso,-experimental-zvbb,-experimental-zvbc,-experimental-zvfbfmin,-experimental-zvfbfwma,-experimental-zvkg,-experimental-zvkn,-experimental-zvknc,-experimental-zvkned,-experimental-zvkng,-experimental-zvknha,-experimental-zvknhb,-experimental-zvks,-experimental-zvksc,-experimental-zvksed,-experimental-zvksg,-experimental-zvksh,-experimental-zvkt,-f,-h,-save-restore,-svinval,-svnapot,-svpbmt,-v,-xcvbitmanip,-xcvmac,-xsfcie,-xsfvcp,-xtheadba,-xtheadbb,-xtheadbs,-xtheadcmo,-xtheadcondmov,-xtheadfmemidx,-xtheadmac,-xtheadmemidx,-xtheadmempair,-xtheadsync,-xtheadvdot,-xventanacondops,-zawrs,-zba,-zbb,-zbc,-zbkb,-zbkc,-zbkx,-zbs,-zca,-zcb,-zcd,-zce,-zcf,-zcmp,-zcmt,-zdinx,-zfh,-zfhmin,-zfinx,-zhinx,-zhinxmin,-zicbom,-zicbop,-zicboz,-zicntr,-zicsr,-zifencei,-zihintpause,-zihpm,-zk,-zkn,-zknd,-zkne,-zknh,-zkr,-zks,-zksed,-zksh,-zkt,-zmmul,-zve32f,-zve32x,-zve64d,-zve64f,-zve64x,-zvfh,-zvl1024b,-zvl128b,-zvl16384b,-zvl2048b,-zvl256b,-zvl32768b,-zvl32b,-zvl4096b,-zvl512b,-zvl64b,-zvl65536b,-zvl8192b" }
+
+; CHECK: 	.section	.compartment_exports,"aR",@progbits
+; CHECK-NEXT:	.type	__library_export_hello__Z11id_functionv,@object
+; CHECK-NEXT:	.p2align	2, 0x0
+; CHECK-NEXT: __library_export_hello__Z11id_functionv:
+; CHECK-NEXT:	.half	_Z11id_functionv-__compartment_pcc_start
+; CHECK-NEXT:	.byte	0
+; CHECK-NEXT:	.byte	16
+; CHECK-NEXT:	.size	__library_export_hello__Z11id_functionv, 4
+; CHECK-NEXT:	.type	__export_hello__Z9say_hellov,@object
+; CHECK-NEXT:	.globl	__export_hello__Z9say_hellov
+; CHECK-NEXT:	.p2align	2, 0x0
+; CHECK-NEXT:__export_hello__Z9say_hellov:
+; CHECK-NEXT:	.half	_Z9say_hellov-__compartment_pcc_start
+; CHECK-NEXT:	.byte	0
+; CHECK-NEXT:	.byte	8
+; CHECK-NEXT:	.size	__export_hello__Z9say_hellov, 4
+; CHECK-NEXT:	.section	.compartment_imports,"aG",@progbits,__library_import_hello__Z11id_functionv,comdat
+; CHECK-NEXT:	.type	__library_import_hello__Z11id_functionv,@object
+; CHECK-NEXT:	.weak	__library_import_hello__Z11id_functionv
+; CHECK-NEXT:	.p2align	3, 0x0
+; CHECK-NEXT:__library_import_hello__Z11id_functionv:
+; CHECK-NEXT:	.word	__library_export_hello__Z11id_functionv+1
+; CHECK-NEXT:	.word	0
+; CHECK-NEXT:	.size	__library_import_hello__Z11id_functionv, 8
\ No newline at end of file