diff --git a/src/entt/entity/registry.hpp b/src/entt/entity/registry.hpp
index 25f183ab3..97a06f82b 100644
--- a/src/entt/entity/registry.hpp
+++ b/src/entt/entity/registry.hpp
@@ -99,7 +99,7 @@ class basic_registry {
         }
 
         template<typename... Args>
-        decltype(auto) replace(basic_registry &owner, const Entity entt, Args &&... args) {
+        auto replace(basic_registry &owner, const Entity entt, Args &&... args) -> decltype(this->get(entt)) {
             Component component{std::forward<Args>(args)...};
             update.publish(owner, entt, component);
             return (this->get(entt) = std::move(component));