diff --git a/Framework/Core/include/Framework/ASoA.h b/Framework/Core/include/Framework/ASoA.h
index 7a3307ae1a58c..96a4fe08cdd61 100644
--- a/Framework/Core/include/Framework/ASoA.h
+++ b/Framework/Core/include/Framework/ASoA.h
@@ -2452,43 +2452,47 @@ consteval static std::string_view namespace_prefix()
   };                                                                                                                                                                              \
   [[maybe_unused]] static constexpr o2::framework::expressions::BindingNode _Getter_ { _Label_, _Name_::hash, o2::framework::expressions::selectArrowType<_Type_>() }
 
-#define DECLARE_SOA_CCDB_COLUMN_FULL(_Name_, _Label_, _Getter_, _ConcreteType_, _CCDBQuery_)                    \
-  struct _Name_ : o2::soa::Column<std::span<std::byte>, _Name_> {                                               \
-    static constexpr const char* mLabel = _Label_;                                                              \
-    static constexpr const char* query = _CCDBQuery_;                                                           \
-    static constexpr const uint32_t hash = crc32(namespace_prefix<_Name_>(), std::string_view{#_Getter_});      \
-    using base = o2::soa::Column<std::span<std::byte>, _Name_>;                                                 \
-    using type = std::span<std::byte>;                                                                          \
-    using column_t = _Name_;                                                                                    \
-    _Name_(arrow::ChunkedArray const* column)                                                                   \
-      : o2::soa::Column<std::span<std::byte>, _Name_>(o2::soa::ColumnIterator<std::span<std::byte>>(column))    \
-    {                                                                                                           \
-    }                                                                                                           \
-                                                                                                                \
-    _Name_() = default;                                                                                         \
-    _Name_(_Name_ const& other) = default;                                                                      \
-    _Name_& operator=(_Name_ const& other) = default;                                                           \
-                                                                                                                \
-    decltype(auto) _Getter_() const                                                                             \
-    {                                                                                                           \
-      static std::byte* payload = nullptr;                                                                      \
-      static _ConcreteType_* deserialised = nullptr;                                                            \
-      static TClass* c = TClass::GetClass(#_ConcreteType_);                                                     \
-      auto span = *mColumnIterator;                                                                             \
-      if (payload != (std::byte*)span.data()) {                                                                 \
-        payload = (std::byte*)span.data();                                                                      \
-        delete deserialised;                                                                                    \
-        TBufferFile f(TBufferFile::EMode::kRead, span.size(), (char*)span.data(), kFALSE);                      \
-        deserialised = (_ConcreteType_*)soa::extractCCDBPayload((char*)payload, span.size(), c, "ccdb_object"); \
-      }                                                                                                         \
-      return *deserialised;                                                                                     \
-    }                                                                                                           \
-                                                                                                                \
-    decltype(auto)                                                                                              \
-      get() const                                                                                               \
-    {                                                                                                           \
-      return _Getter_();                                                                                        \
-    }                                                                                                           \
+#define DECLARE_SOA_CCDB_COLUMN_FULL(_Name_, _Label_, _Getter_, _ConcreteType_, _CCDBQuery_)                      \
+  struct _Name_ : o2::soa::Column<std::span<std::byte>, _Name_> {                                                 \
+    static constexpr const char* mLabel = _Label_;                                                                \
+    static constexpr const char* query = _CCDBQuery_;                                                             \
+    static constexpr const uint32_t hash = crc32(namespace_prefix<_Name_>(), std::string_view{#_Getter_});        \
+    using base = o2::soa::Column<std::span<std::byte>, _Name_>;                                                   \
+    using type = std::span<std::byte>;                                                                            \
+    using column_t = _Name_;                                                                                      \
+    _Name_(arrow::ChunkedArray const* column)                                                                     \
+      : o2::soa::Column<std::span<std::byte>, _Name_>(o2::soa::ColumnIterator<std::span<std::byte>>(column))      \
+    {                                                                                                             \
+    }                                                                                                             \
+                                                                                                                  \
+    _Name_() = default;                                                                                           \
+    _Name_(_Name_ const& other) = default;                                                                        \
+    _Name_& operator=(_Name_ const& other) = default;                                                             \
+                                                                                                                  \
+    decltype(auto) _Getter_() const                                                                               \
+    {                                                                                                             \
+      if constexpr (std::same_as<_ConcreteType_, std::span<std::byte>>) {                                         \
+        return *mColumnIterator;                                                                                  \
+      } else {                                                                                                    \
+        static std::byte* payload = nullptr;                                                                      \
+        static _ConcreteType_* deserialised = nullptr;                                                            \
+        static TClass* c = TClass::GetClass(#_ConcreteType_);                                                     \
+        auto span = *mColumnIterator;                                                                             \
+        if (payload != (std::byte*)span.data()) {                                                                 \
+          payload = (std::byte*)span.data();                                                                      \
+          delete deserialised;                                                                                    \
+          TBufferFile f(TBufferFile::EMode::kRead, span.size(), (char*)span.data(), kFALSE);                      \
+          deserialised = (_ConcreteType_*)soa::extractCCDBPayload((char*)payload, span.size(), c, "ccdb_object"); \
+        }                                                                                                         \
+        return *deserialised;                                                                                     \
+      }                                                                                                           \
+    }                                                                                                             \
+                                                                                                                  \
+    decltype(auto)                                                                                                \
+      get() const                                                                                                 \
+    {                                                                                                             \
+      return _Getter_();                                                                                          \
+    }                                                                                                             \
   };
 
 #define DECLARE_SOA_CCDB_COLUMN(_Name_, _Getter_, _ConcreteType_, _CCDBQuery_) \