diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/memory/PinotDataBuffer.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/memory/PinotDataBuffer.java
index 2ed9d22e9257..c2fb5084a754 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/memory/PinotDataBuffer.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/memory/PinotDataBuffer.java
@@ -167,13 +167,8 @@ public static PinotBufferFactory createDefaultFactory(boolean prioritizeByteBuff
     String factoryClassName;
     factoryClassName = System.getenv("PINOT_BUFFER_LIBRARY");
     if (factoryClassName == null) {
-      if (JavaVersion.VERSION < 16) {
-        LOGGER.info("Using LArray as buffer on JVM version {}", JavaVersion.VERSION);
-        factoryClassName = LArrayPinotBufferFactory.class.getCanonicalName();
-      } else {
-        LOGGER.info("Using Unsafe as buffer on JVM version {}", JavaVersion.VERSION);
-        factoryClassName = UnsafePinotBufferFactory.class.getCanonicalName();
-      }
+      LOGGER.info("Using Unsafe as buffer on JVM version {}", JavaVersion.VERSION);
+      factoryClassName = UnsafePinotBufferFactory.class.getCanonicalName();
     }
     return createFactory(factoryClassName, prioritizeByteBuffer);
   }