diff --git a/src/components/camera-tool.js b/src/components/camera-tool.js
index 6037470d7c..05d04111c9 100644
--- a/src/components/camera-tool.js
+++ b/src/components/camera-tool.js
@@ -105,7 +105,7 @@ AFRAME.registerComponent("camera-tool", {
       this.el.setObject3D("mesh", mesh);
 
       const width = 0.28;
-      const geometry = new THREE.PlaneGeometry(width, width / this.camera.aspect);
+      const geometry = new THREE.PlaneBufferGeometry(width, width / this.camera.aspect);
 
       if (enableCameraViewport) {
         const screen = new THREE.Mesh(geometry, material);
diff --git a/src/react-components/chat-message.js b/src/react-components/chat-message.js
index 292ba252ed..a0f8acfb43 100644
--- a/src/react-components/chat-message.js
+++ b/src/react-components/chat-message.js
@@ -189,7 +189,7 @@ export async function createInWorldLogMessage({ name, type, body }) {
     material.generateMipmaps = false;
     material.needsUpdate = true;
 
-    const geometry = new THREE.PlaneGeometry();
+    const geometry = new THREE.PlaneBufferGeometry(1, 1, 1, 1, texture.flipY);
     const mesh = new THREE.Mesh(geometry, material);
     meshEntity.setObject3D("mesh", mesh);
     meshEntity.meshMaterial = material;