diff --git a/gen/toir.cpp b/gen/toir.cpp
index aa966c549d..763230d0d2 100644
--- a/gen/toir.cpp
+++ b/gen/toir.cpp
@@ -2146,7 +2146,12 @@ class ToElemVisitor : public Visitor {
         DtoAssign(e->loc, &dst, u, EXP::blit);
       }
     }
+
+#if LLVM_VERSION_MAJOR >= 23
+    if (!p->scopebb()->getTerminatorOrNull()) {
+#else
     if (!p->scopebb()->getTerminator()) {
+#endif
       u_bb = p->scopebb();
     }
     createBranch(condend, p->scopebb());
@@ -2163,7 +2168,12 @@ class ToElemVisitor : public Visitor {
         DtoAssign(e->loc, &dst, v, EXP::blit);
       }
     }
+
+#if LLVM_VERSION_MAJOR >= 23
+    if (!p->scopebb()->getTerminatorOrNull()) {
+#else
     if (!p->scopebb()->getTerminator()) {
+#endif
       v_bb = p->scopebb();
     }
     createBranch(condend, p->scopebb());