diff --git a/Services/TelnetServer/Client.cpp b/Services/TelnetServer/Client.cpp
index e983025df6..dba7c8a052 100644
--- a/Services/TelnetServer/Client.cpp
+++ b/Services/TelnetServer/Client.cpp
@@ -25,8 +25,8 @@
  */
 
 #include "Client.h"
-#include <AK/BufferStream.h>
 #include <AK/ByteBuffer.h>
+#include <AK/MemoryStream.h>
 #include <AK/String.h>
 #include <AK/StringBuilder.h>
 #include <AK/StringView.h>
@@ -171,10 +171,12 @@ void Client::send_command(Command command)
 void Client::send_commands(Vector<Command> commands)
 {
     auto buffer = ByteBuffer::create_uninitialized(commands.size() * 3);
-    BufferStream stream(buffer);
+    OutputMemoryStream stream { buffer };
+
     for (auto& command : commands)
         stream << (u8)IAC << command.command << command.subcommand;
-    stream.snip();
+
+    ASSERT(stream.is_end());
     m_socket->write(buffer.data(), buffer.size());
 }
 
diff --git a/Services/TelnetServer/main.cpp b/Services/TelnetServer/main.cpp
index 6acb900b61..3fd26aff42 100644
--- a/Services/TelnetServer/main.cpp
+++ b/Services/TelnetServer/main.cpp
@@ -25,7 +25,6 @@
  */
 
 #include "Client.h"
-#include <AK/BufferStream.h>
 #include <AK/ByteBuffer.h>
 #include <AK/HashMap.h>
 #include <AK/IPv4Address.h>