diff --git a/src/stream_manager.hpp b/src/stream_manager.hpp
index 83105173..0dc1353d 100644
--- a/src/stream_manager.hpp
+++ b/src/stream_manager.hpp
@@ -36,7 +36,7 @@ namespace Components {
 
 
 class StreamManager {
-	friend class StreamManagerUI;
+	friend class StreamManagerUI; // TODO: make this go away
 	ObjectStore2& _os;
 
 	struct Connection {
diff --git a/src/stream_manager_ui.cpp b/src/stream_manager_ui.cpp
index 69c5eb7d..c674de59 100644
--- a/src/stream_manager_ui.cpp
+++ b/src/stream_manager_ui.cpp
@@ -168,7 +168,7 @@ void StreamManagerUI::render(void) {
 
 				ImGui::TableNextColumn();
 				if (ImGui::SmallButton("X")) {
-					// TODO: disconnect
+					con->stop = true;
 				}
 
 				ImGui::TableNextColumn();