diff --git a/Telegram/SourceFiles/rpl/consumer.h b/Telegram/SourceFiles/rpl/consumer.h
index 3766c9cd3c..8adfc500cf 100644
--- a/Telegram/SourceFiles/rpl/consumer.h
+++ b/Telegram/SourceFiles/rpl/consumer.h
@@ -63,7 +63,7 @@ public:
 	virtual void put_error_copy(const Error &error) = 0;
 	virtual void put_done() = 0;
 
-	void add_lifetime(lifetime &&lifetime);
+	bool add_lifetime(lifetime &&lifetime);
 
 	template <typename Type, typename... Args>
 	Type *make_state(Args&& ...args);
@@ -135,20 +135,23 @@ private:
 };
 
 template <typename Value, typename Error>
-inline void type_erased_handlers<Value, Error>::add_lifetime(
+inline bool type_erased_handlers<Value, Error>::add_lifetime(
 		lifetime &&lifetime) {
 	if (_terminated) {
 		lifetime.destroy();
-	} else {
-		_lifetime.add(std::move(lifetime));
+		return false;
 	}
+	_lifetime.add(std::move(lifetime));
+	return true;
 }
 
 template <typename Value, typename Error>
 template <typename Type, typename... Args>
 inline Type *type_erased_handlers<Value, Error>::make_state(
 		Args&& ...args) {
-	Expects(!_terminated);
+	if (_terminated) {
+		return nullptr;
+	}
 	return _lifetime.make_state<Type>(std::forward<Args>(args)...);
 }
 
@@ -320,7 +323,7 @@ public:
 	}
 	void put_done() const;
 
-	void add_lifetime(lifetime &&lifetime) const;
+	bool add_lifetime(lifetime &&lifetime) const;
 
 	template <typename Type, typename... Args>
 	Type *make_state(Args&& ...args) const;
@@ -447,22 +450,32 @@ inline void consumer_base<Value, Error, Handlers>::put_done() const {
 }
 
 template <typename Value, typename Error, typename Handlers>
-inline void consumer_base<Value, Error, Handlers>::add_lifetime(
+inline bool consumer_base<Value, Error, Handlers>::add_lifetime(
 		lifetime &&lifetime) const {
-	if (_handlers) {
-		_handlers->add_lifetime(std::move(lifetime));
-	} else {
+	if (!_handlers) {
 		lifetime.destroy();
+		return false;
 	}
+	if (_handlers->add_lifetime(std::move(lifetime))) {
+		return true;
+	}
+	_handlers = nullptr;
+	return false;
 }
 
 template <typename Value, typename Error, typename Handlers>
 template <typename Type, typename... Args>
 inline Type *consumer_base<Value, Error, Handlers>::make_state(
 		Args&& ...args) const {
-	Expects(_handlers != nullptr);
-	return _handlers->template make_state<Type>(
-		std::forward<Args>(args)...);
+	if (!_handlers) {
+		return nullptr;
+	}
+	if (auto result = _handlers->template make_state<Type>(
+			std::forward<Args>(args)...)) {
+		return result;
+	}
+	_handlers = nullptr;
+	return nullptr;
 }
 
 template <typename Value, typename Error, typename Handlers>
diff --git a/Telegram/SourceFiles/rpl/flatten_latest.h b/Telegram/SourceFiles/rpl/flatten_latest.h
index 921124f454..bce4a4e21b 100644
--- a/Telegram/SourceFiles/rpl/flatten_latest.h
+++ b/Telegram/SourceFiles/rpl/flatten_latest.h
@@ -39,11 +39,12 @@ public:
 		return make_producer<Value, Error>([
 			initial = std::move(initial)
 		](const auto &consumer) mutable {
-			auto state = std::make_shared<State>();
+			auto state = consumer.template make_state<State>();
 			return std::move(initial).start(
 			[consumer, state](producer<Value, Error> &&inner) {
 				state->finished = false;
-				state->alive = std::move(inner).start(
+				state->alive = lifetime();
+				auto started = std::move(inner).start(
 				[consumer](auto &&value) {
 					consumer.put_next_forward(std::forward<decltype(value)>(value));
 				}, [consumer](auto &&error) {
@@ -55,6 +56,9 @@ public:
 						state->finished = true;
 					}
 				});
+				if (started) {
+					state->alive = std::move(started);
+				}
 			}, [consumer](auto &&error) {
 				consumer.put_error_forward(std::forward<decltype(error)>(error));
 			}, [consumer, state] {
diff --git a/Telegram/SourceFiles/rpl/operators_tests.cpp b/Telegram/SourceFiles/rpl/operators_tests.cpp
index bd7320006b..b46b615830 100644
--- a/Telegram/SourceFiles/rpl/operators_tests.cpp
+++ b/Telegram/SourceFiles/rpl/operators_tests.cpp
@@ -238,16 +238,22 @@ TEST_CASE("basic operators tests", "[rpl::operators]") {
 		auto sum = std::make_shared<std::string>("");
 		{
 			rpl::lifetime lifetime;
-			single(single(1) | then(single(2)))
-				| then(single(single(3) | then(single(4))))
-				| then(single(single(5) | then(single(6))))
-				| flatten_latest()
-				| map([](int value) {
-					return std::to_string(value);
-				})
-				| start_with_next([=](std::string &&value) {
-					*sum += std::move(value) + ' ';
-				}, lifetime);
+			{
+				rpl::event_stream<int> stream;
+				single(single(1) | then(single(2)))
+					| then(single(single(3) | then(single(4))))
+					| then(single(single(5) | then(stream.events())))
+					| flatten_latest()
+					| map([](int value) {
+						return std::to_string(value);
+					})
+					| start_with_next_done([=](std::string &&value) {
+						*sum += std::move(value) + ' ';
+					}, [=] {
+						*sum += "done ";
+					}, lifetime);
+				stream.fire(6);
+			}
 			single(single(1))
 				| then(single(single(2) | then(single(3))))
 				| then(single(single(4) | then(single(5)) | then(single(6))))
@@ -259,7 +265,7 @@ TEST_CASE("basic operators tests", "[rpl::operators]") {
 					*sum += std::move(value) + ' ';
 				}, lifetime);
 		}
-		REQUIRE(*sum == "1 2 3 4 5 6 1 2 3 4 5 6 ");
+		REQUIRE(*sum == "1 2 3 4 5 6 done 1 2 3 4 5 6 ");
 	}
 
 	SECTION("combine vector test") {
diff --git a/Telegram/SourceFiles/rpl/producer.h b/Telegram/SourceFiles/rpl/producer.h
index a70c74eb25..7d7d99d1a6 100644
--- a/Telegram/SourceFiles/rpl/producer.h
+++ b/Telegram/SourceFiles/rpl/producer.h
@@ -265,8 +265,10 @@ template <typename Value, typename Error, typename Generator>
 template <typename Handlers>
 inline lifetime producer_base<Value, Error, Generator>::start_existing(
 		const consumer_type<Handlers> &consumer) && {
-	consumer.add_lifetime(std::move(_generator)(consumer));
-	return [consumer] { consumer.terminate(); };
+	if (consumer.add_lifetime(std::move(_generator)(consumer))) {
+		return [consumer] { consumer.terminate(); };
+	}
+	return lifetime();
 }
 
 template <typename Value, typename Error>