diff --git a/src/main/java/org/mariadb/r2dbc/client/MariadbResult.java b/src/main/java/org/mariadb/r2dbc/client/MariadbResult.java
index bd0ff6b0..09a25347 100644
--- a/src/main/java/org/mariadb/r2dbc/client/MariadbResult.java
+++ b/src/main/java/org/mariadb/r2dbc/client/MariadbResult.java
@@ -161,7 +161,7 @@ public <T> Flux<T> map(BiFunction<Row, RowMetadata, ? extends T> f) {
 
               ByteBuf buf = getLongTextEncoded(okPacket.getLastInsertId());
               org.mariadb.r2dbc.api.MariadbRow row = new MariadbRowText(buf, tmpMeta, factory);
-              sink.next(f.apply(row, meta.get()));
+              sink.next(f.apply(row, row.getMetadata()));
               ReferenceCountUtil.release(row);
             }
             return;