diff --git a/include/etl/alignment.h b/include/etl/alignment.h
index 5ab63802..c289b4a4 100644
--- a/include/etl/alignment.h
+++ b/include/etl/alignment.h
@@ -450,9 +450,17 @@ namespace etl
     template <typename... TArgs>
     reference create(TArgs&&... args) ETL_NOEXCEPT_EXPR(ETL_NOT_USING_EXCEPTIONS)
     {
-      ETL_ASSERT(!has_value(), ETL_ERROR(etl::typed_storage_error));
-      valid = true;
-      return *::new (&storage.value) value_type(etl::forward<TArgs>(args)...);
+      if (has_value())
+      {
+        storage.value = T(args...);
+      }
+      else
+      {
+        valid = true;
+        ::new (&storage.value) value_type(etl::forward<TArgs>(args)...);
+      }
+
+      return storage.value;
     }
 #else
     //***************************************************************************
@@ -462,9 +470,17 @@ namespace etl
     template <typename T1>
     reference create(const T1& t1)
     {
-      ETL_ASSERT(!has_value(), ETL_ERROR(etl::typed_storage_error));
-      valid = true;
-      return *::new (&storage.value) value_type(t1);
+      if (has_value())
+      {
+        storage.value = T(t1);
+      }
+      else
+      {
+        valid = true;
+        ::new (&storage.value) value_type(t1);
+      }
+
+      return storage.value;
     }
 
     //***************************************************************************
@@ -474,9 +490,17 @@ namespace etl
     template <typename T1, typename T2>
     reference create(const T1& t1, const T2& t2)
     {
-      ETL_ASSERT(!has_value(), ETL_ERROR(etl::typed_storage_error));
-      valid = true;
-      return *::new (&storage.value) value_type(t1, t2);
+      if (has_value())
+      {
+        storage.value = T(t1, t2);
+      }
+      else
+      {
+        valid = true;
+        ::new (&storage.value) value_type(t1, t2);
+      }
+
+      return storage.value;
     }
 
     //***************************************************************************
@@ -486,9 +510,17 @@ namespace etl
     template <typename T1, typename T2, typename T3>
     reference create(const T1& t1, const T2& t2, const T3& t3)
     {
-      ETL_ASSERT(!has_value(), ETL_ERROR(etl::typed_storage_error));
-      valid = true;
-      return *::new (&storage.value) value_type(t1, t2, t3);
+      if (has_value())
+      {
+        storage.value = T(t1, t2, t3);
+      }
+      else
+      {
+        valid = true;
+        ::new (&storage.value) value_type(t1, t2, t3);
+      }
+
+      return storage.value;
     }
 
     //***************************************************************************
@@ -498,9 +530,17 @@ namespace etl
     template <typename T1, typename T2, typename T3, typename T4>
     reference create(const T1& t1, const T2& t2, const T3& t3, const T4& t4)
     {
-      ETL_ASSERT(!has_value(), ETL_ERROR(etl::typed_storage_error));
-      valid = true;
-      return *::new (&storage.value) value_type(t1, t2, t3, t4);
+      if (has_value())
+      {
+        storage.value = T(t1, t2, t3, t4);
+      }
+      else
+      {
+        valid = true;
+        ::new (&storage.value) value_type(t1, t2, t3, t4);
+      }
+
+      return storage.value;
     }
 #endif
 
@@ -559,7 +599,7 @@ namespace etl
 
     struct dummy_t {};
 
-    //*******************************
+   //*******************************
     union union_type
     {
       union_type() ETL_NOEXCEPT
diff --git a/include/etl/optional.h b/include/etl/optional.h
index 48289116..e8e40439 100644
--- a/include/etl/optional.h
+++ b/include/etl/optional.h
@@ -536,6 +536,17 @@ namespace etl
 
         return storage.u.value;
       }
+
+      //*************************************************************************
+      /// Emplaces with zero arguments, i.e. default construct emplace.
+      //*************************************************************************
+      ETL_CONSTEXPR20_STL
+      T& emplace()
+      {
+        storage.construct();
+
+        return storage.u.value;
+      }
 #else
       //*************************************************************************
       /// Emplaces a value.
diff --git a/test/test_optional.cpp b/test/test_optional.cpp
index e9623b87..c5a34d08 100644
--- a/test/test_optional.cpp
+++ b/test/test_optional.cpp
@@ -218,15 +218,27 @@ namespace
     }
 
     //*************************************************************************
-    TEST(test_emplace_zero_parameters)
+    TEST(test_emplace_zero_parameters_fundamental)
     {
       etl::optional<std::uint8_t> result = 1;
-      result.emplace();
+      CHECK_EQUAL(0, static_cast<int>(result.emplace()));
 
       CHECK_TRUE(result.has_value());
       CHECK_EQUAL(0, int(result.value()));
     }
 
+    //*************************************************************************
+    TEST(test_emplace_zero_parameters_non_fundamental)
+    {
+      etl::optional<std::string> result = std::string("abc");
+
+      std::string& ref = result.emplace();
+      CHECK_EQUAL(std::string(), ref);
+      CHECK_EQUAL(&ref, &result.value());
+      CHECK_TRUE(result.has_value());
+      CHECK_EQUAL("", std::string(result.value()));
+    }
+
     //*************************************************************************
     TEST(test_emplace_return)
     {