diff --git a/src/modules/m_spanningtree/server.cpp b/src/modules/m_spanningtree/server.cpp
index 1b13fb2da6..64c32e8fbb 100644
--- a/src/modules/m_spanningtree/server.cpp
+++ b/src/modules/m_spanningtree/server.cpp
@@ -163,15 +163,15 @@ bool TreeSocket::Outbound_Reply_Server(parameterlist &params)
 		linkID = sname;
 
 		MyRoot = new TreeServer(Utils, sname, description, sid, Utils->TreeRoot, this, x->Hidden);
-
 		Utils->TreeRoot->AddChild(MyRoot);
+		this->DoBurst(MyRoot);
+
 		params[4] = ":" + params[4];
 
 		/* IMPORTANT: Take password/hmac hash OUT of here before we broadcast the introduction! */
 		params[1] = "*";
 		Utils->DoOneToAllButSender(ServerInstance->Config->GetSID(),"SERVER",params,sname);
 
-		this->DoBurst(MyRoot);
 		return true;
 	}
 
@@ -259,10 +259,6 @@ bool TreeSocket::Inbound_Server(parameterlist &params)
 		MyRoot = new TreeServer(Utils, sname, description, sid, Utils->TreeRoot, this, x->Hidden);
 		Utils->TreeRoot->AddChild(MyRoot);
 
-		params[1] = "*";
-		params[4] = ":" + params[4];
-		Utils->DoOneToAllButSender(ServerInstance->Config->GetSID(),"SERVER",params,sname);
-
 		this->LinkState = WAIT_AUTH_2;
 		return true;
 	}
diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp
index 673b05c556..dcb35af317 100644
--- a/src/modules/m_spanningtree/treesocket1.cpp
+++ b/src/modules/m_spanningtree/treesocket1.cpp
@@ -183,10 +183,14 @@ void TreeSocket::Squit(TreeServer* Current, const std::string &reason)
 	{
 		DelServerEvent(Utils->Creator, Current->GetName());
 
-		parameterlist params;
-		params.push_back(Current->GetName());
-		params.push_back(":"+reason);
-		Utils->DoOneToAllButSender(Current->GetParent()->GetName(),"SQUIT",params,Current->GetName());
+		if (!Current->GetSocket() || Current->GetSocket()->GetLinkState() == CONNECTED)
+		{
+			parameterlist params;
+			params.push_back(Current->GetName());
+			params.push_back(":"+reason);
+			Utils->DoOneToAllButSender(Current->GetParent()->GetName(),"SQUIT",params,Current->GetName());
+		}
+
 		if (Current->GetParent() == Utils->TreeRoot)
 		{
 			ServerInstance->SNO->WriteGlobalSno('l', "Server \002"+Current->GetName()+"\002 split: "+reason);
diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index 4582eb4c52..cb49d92c92 100644
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -165,12 +165,19 @@ void TreeSocket::ProcessLine(std::string &line)
 					}
 				}
 				this->LinkState = CONNECTED;
-
 				Utils->timeoutlist.erase(this);
-				parameterlist sparams;
-				Utils->DoOneToAllButSender(MyRoot->GetID(), "BURST", params, MyRoot->GetName());
+
 				MyRoot->bursting = true;
 				this->DoBurst(MyRoot);
+
+				parameterlist sparams;
+				sparams.push_back(MyRoot->GetName());
+				sparams.push_back("*");
+				sparams.push_back("0");
+				sparams.push_back(MyRoot->GetID());
+				sparams.push_back(":" + MyRoot->GetDesc());
+				Utils->DoOneToAllButSender(ServerInstance->Config->GetSID(), "SERVER", sparams, MyRoot->GetName());
+				Utils->DoOneToAllButSender(MyRoot->GetID(), "BURST", params, MyRoot->GetName());
 			}
 			else if (command == "ERROR")
 			{