diff --git a/libuavcan/include/uavcan/transport/transfer_buffer.hpp b/libuavcan/include/uavcan/transport/transfer_buffer.hpp
index 0a1065156f..cab0d1c500 100644
--- a/libuavcan/include/uavcan/transport/transfer_buffer.hpp
+++ b/libuavcan/include/uavcan/transport/transfer_buffer.hpp
@@ -287,7 +287,7 @@ public:
 template <uint16_t MaxBufSize, uint8_t NumStaticBufs>
 class UAVCAN_EXPORT TransferBufferManager : public TransferBufferManagerImpl
 {
-    mutable StaticTransferBufferManagerEntry<MaxBufSize> static_buffers_[NumStaticBufs];  // TODO: zero buffers support
+    mutable StaticTransferBufferManagerEntry<MaxBufSize> static_buffers_[NumStaticBufs];
 
     StaticTransferBufferManagerEntry<MaxBufSize>* getStaticByIndex(uint16_t index) const
     {
@@ -302,6 +302,22 @@ public:
     }
 };
 
+template <uint16_t MaxBufSize>
+class UAVCAN_EXPORT TransferBufferManager<MaxBufSize, 0> : public TransferBufferManagerImpl
+{
+    StaticTransferBufferManagerEntry<MaxBufSize>* getStaticByIndex(uint16_t index) const
+    {
+        return NULL;
+    }
+
+public:
+    TransferBufferManager(IPoolAllocator& allocator)
+        : TransferBufferManagerImpl(MaxBufSize, allocator)
+    {
+        StaticAssert<(MaxBufSize > 0)>::check();
+    }
+};
+
 template <>
 class UAVCAN_EXPORT TransferBufferManager<0, 0> : public ITransferBufferManager
 {