diff --git a/src/fury/encoder/row_encode_trait.h b/src/fury/encoder/row_encode_trait.h
index c0eeb9da34..e87d2f1c2b 100644
--- a/src/fury/encoder/row_encode_trait.h
+++ b/src/fury/encoder/row_encode_trait.h
@@ -70,9 +70,13 @@ inline constexpr bool IsString =
 template <typename T>
 inline constexpr bool IsArray = meta::IsIterable<T> && !IsString<T>;
 
+template <typename> inline constexpr bool IsOptional = false;
+
+template <typename T> inline constexpr bool IsOptional<std::optional<T>> = true;
+
 template <typename T>
 inline constexpr bool IsClassButNotBuiltin =
-    std::is_class_v<T> && !(IsString<T> || IsArray<T>);
+    std::is_class_v<T> && !(IsString<T> || IsArray<T> || IsOptional<T>);
 
 inline decltype(auto) GetChildType(RowWriter &writer, int index) {
   return writer.schema()->field(index)->type();
@@ -140,6 +144,24 @@ struct RowEncodeTrait<
   }
 };
 
+template <typename T>
+struct RowEncodeTrait<
+    T, std::enable_if_t<details::IsOptional<std::remove_cv_t<T>>>> {
+  static auto Type() { return RowEncodeTrait<typename T::value_type>::Type(); }
+
+  template <typename V, typename W,
+            std::enable_if_t<meta::IsOneOf<W, RowWriter, ArrayWriter>::value,
+                             int> = 0>
+  static void Write(V &&visitor, const T &value, W &writer, int index) {
+    if (value) {
+      RowEncodeTrait<typename T::value_type>::Write(std::forward<V>(visitor),
+                                                    *value, writer, index);
+    } else {
+      writer.SetNullAt(index);
+    }
+  }
+};
+
 template <typename T>
 struct RowEncodeTrait<
     T, std::enable_if_t<details::IsClassButNotBuiltin<std::remove_cv_t<T>>>> {
diff --git a/src/fury/encoder/row_encode_trait_test.cc b/src/fury/encoder/row_encode_trait_test.cc
index 8f049efb47..e8a0ee4471 100644
--- a/src/fury/encoder/row_encode_trait_test.cc
+++ b/src/fury/encoder/row_encode_trait_test.cc
@@ -16,6 +16,7 @@
 
 #include "gtest/gtest.h"
 #include <memory>
+#include <optional>
 #include <type_traits>
 
 #include "fury/encoder/row_encode_trait.h"
@@ -247,6 +248,52 @@ TEST(RowEncodeTrait, ArrayInArray) {
   ASSERT_EQ(array->GetArray(2)->GetInt32(2), 60);
 }
 
+struct F {
+  bool a;
+  std::optional<int> b;
+  int c;
+};
+
+FURY_FIELD_INFO(F, a, b, c);
+
+TEST(RowEncodeTrait, Optional) {
+  F x{false, 233, 111}, y{true, std::nullopt, 222};
+
+  auto schema = encoder::RowEncodeTrait<F>::Type();
+  ASSERT_EQ(schema->field(0)->type()->name(), "bool");
+  ASSERT_EQ(schema->field(1)->type()->name(), "int32");
+  ASSERT_EQ(schema->field(2)->type()->name(), "int32");
+
+  {
+    RowWriter writer(encoder::RowEncodeTrait<F>::Schema());
+    writer.Reset();
+
+    encoder::RowEncodeTrait<F>::Write(encoder::EmptyWriteVisitor{}, x, writer);
+
+    auto row = writer.ToRow();
+    ASSERT_EQ(row->IsNullAt(0), false);
+    ASSERT_EQ(row->IsNullAt(1), false);
+    ASSERT_EQ(row->IsNullAt(2), false);
+
+    ASSERT_EQ(row->GetInt32(1), 233);
+    ASSERT_EQ(row->GetInt32(2), 111);
+  }
+
+  {
+    RowWriter writer(encoder::RowEncodeTrait<F>::Schema());
+    writer.Reset();
+
+    encoder::RowEncodeTrait<F>::Write(encoder::EmptyWriteVisitor{}, y, writer);
+
+    auto row = writer.ToRow();
+    ASSERT_EQ(row->IsNullAt(0), false);
+    ASSERT_EQ(row->IsNullAt(1), true);
+    ASSERT_EQ(row->IsNullAt(2), false);
+
+    ASSERT_EQ(row->GetInt32(2), 222);
+  }
+}
+
 } // namespace test
 
 } // namespace fury