diff --git a/components/streams/src/feed.cpp b/components/streams/src/feed.cpp
index 77e183c867c9875d4bc7460b10b1b76116ea3f06..7e43eab80a6b2a12038657ac5cef4ad861c103be 100644
--- a/components/streams/src/feed.cpp
+++ b/components/streams/src/feed.cpp
@@ -396,6 +396,8 @@ ftl::operators::Graph* Feed::_addPipeline(uint32_t fsid) {
 }
 
 void Feed::_createPipeline(uint32_t fsid) {
+	// FIXME: Must not recreate if already exists
+	
 	LOG(INFO) << "Creating pipeline";
 	auto *p = _addPipeline(fsid);
 
diff --git a/components/streams/src/netstream.cpp b/components/streams/src/netstream.cpp
index 44ae5c8042ecdd0275c73e19d0f5165721ebd3c8..fba498e1bf03ff96b6760d34b35d33e7896945d5 100644
--- a/components/streams/src/netstream.cpp
+++ b/components/streams/src/netstream.cpp
@@ -137,7 +137,6 @@ bool Net::post(const ftl::codecs::StreamPacket &spkt, const ftl::codecs::Packet
 bool Net::begin() {
 	if (active_) return true;
 	if (!get<string>("uri")) return false;
-	active_ = true;
 
 	uri_ = *get<string>("uri");
 
@@ -264,6 +263,8 @@ bool Net::begin() {
 	peer_ = *p;
 	tally_ = 30*kTallyScale;
 	for (size_t i=0; i<reqtally_.size(); ++i) reqtally_[i] = 0;
+
+	active_ = true;
 	
 	// Initially send a colour request just to create the connection
 	_sendRequest(Channel::Colour, kAllFramesets, kAllFrames, 30, 0);