diff --git a/include/flatmemory/details/types/optional.hpp b/include/flatmemory/details/types/optional.hpp
index 33218cf..dcbfbd5 100644
--- a/include/flatmemory/details/types/optional.hpp
+++ b/include/flatmemory/details/types/optional.hpp
@@ -57,6 +57,22 @@ struct Optional : public NonTrivialType
     Optional(const Optional& other) {}
 };
 
+template<IsTriviallyCopyable T>
+struct Optional<T> : public NonTrivialType
+{
+    /// @brief Non-trivial copy-constructor
+    /// @param other
+    Optional(const Optional& other) {}
+};
+
+template<IsNonTrivialType T>
+struct Optional<T> : public NonTrivialType
+{
+    /// @brief Non-trivial copy-constructor
+    /// @param other
+    Optional(const Optional& other) {}
+};
+
 /**
  * Layout
  */