diff --git a/code/controllers/subsystem/instancing.dm b/code/controllers/subsystem/instancing.dm
index 30214e010a8..ad9cfcbaaa6 100644
--- a/code/controllers/subsystem/instancing.dm
+++ b/code/controllers/subsystem/instancing.dm
@@ -117,7 +117,7 @@ SUBSYSTEM_DEF(instancing)
 /datum/controller/subsystem/instancing/proc/message_all_peers(message)
 	if(!SSdbcore.IsConnected())
 		return
-	var/topic_string = "instance_announce&msg=[html_encode(message)]"
+	var/topic_string = "instance_announce&msg=[url_encode(message)]"
 	topic_all_peers(topic_string)
 
 /**
@@ -151,6 +151,8 @@ SUBSYSTEM_DEF(instancing)
 
 		servers_outer[dbq1.item[1]][dbq1.item[2]] = dbq1.item[3] // This should assoc load our data
 
+	qdel(dbq1)
+
 	for(var/server in servers_outer)
 		var/server_data = servers_outer[server]
 		world.Export("byond://[server_data["internal_ip"]]:[server_data["server_port"]]?[raw_topic]&key=[server_data["topic_key"]]")
diff --git a/code/modules/world_topic/instance_announce.dm b/code/modules/world_topic/instance_announce.dm
index d4ecaa1ba85..dc58e11ce4f 100644
--- a/code/modules/world_topic/instance_announce.dm
+++ b/code/modules/world_topic/instance_announce.dm
@@ -3,5 +3,6 @@
 	requires_commskey = TRUE
 
 /datum/world_topic_handler/instance_announce/execute(list/input, key_valid)
-	to_chat(world, "<center><span class='boldannounce'><big>Attention</big></span></center><hr>[input["msg"]]<hr>")
+	var/msg = input["msg"]
+	to_chat(world, "<center><span class='boldannounce'><big>Attention</big></span></center><hr>[msg]<hr>")
 	SEND_SOUND(world, sound('sound/misc/notice2.ogg')) // Same as captains priority announce