diff --git a/intern/cycles/device/hiprt/device_impl.cpp b/intern/cycles/device/hiprt/device_impl.cpp
index 2a4d3471f41..eecb4e60adb 100644
--- a/intern/cycles/device/hiprt/device_impl.cpp
+++ b/intern/cycles/device/hiprt/device_impl.cpp
@@ -805,7 +805,7 @@ void HIPRTDevice::build_blas(BVHHIPRT *bvh, Geometry *geom, hiprtBuildOptions op
 }
 
 hiprtScene HIPRTDevice::build_tlas(BVHHIPRT *bvh,
-                                   vector<Object *> objects,
+                                   const vector<Object *> &objects,
                                    hiprtBuildOptions options,
                                    bool refit)
 {
@@ -1097,18 +1097,16 @@ void HIPRTDevice::build_bvh(BVH *bvh, Progress &progress, bool refit)
   HIPContextScope scope(this);
 
   if (!bvh_rt->is_tlas()) {
-    vector<Geometry *> geometry = bvh_rt->geometry;
+    const vector<Geometry *> &geometry = bvh_rt->geometry;
     assert(geometry.size() == 1);
-    Geometry *geom = geometry[0];
-    build_blas(bvh_rt, geom, options);
+    build_blas(bvh_rt, geometry[0], options);
   }
   else {
 
-    const vector<Object *> objects = bvh_rt->objects;
     if (scene) {
       hiprtDestroyScene(hiprt_context, scene);
     }
-    scene = build_tlas(bvh_rt, objects, options, refit);
+    scene = build_tlas(bvh_rt, bvh_rt->objects, options, refit);
   }
 }
 CCL_NAMESPACE_END
diff --git a/intern/cycles/device/hiprt/device_impl.h b/intern/cycles/device/hiprt/device_impl.h
index 294d1086a2b..a6465d787dd 100644
--- a/intern/cycles/device/hiprt/device_impl.h
+++ b/intern/cycles/device/hiprt/device_impl.h
@@ -62,7 +62,7 @@ class HIPRTDevice : public HIPDevice {
   hiprtGeometryBuildInput prepare_point_blas(BVHHIPRT *bvh, PointCloud *pointcloud);
   void build_blas(BVHHIPRT *bvh, Geometry *geom, hiprtBuildOptions options);
   hiprtScene build_tlas(BVHHIPRT *bvh,
-                        vector<Object *> objects,
+                        const vector<Object *> &objects,
                         hiprtBuildOptions options,
                         bool refit);