diff --git a/src/fprime/cookiecutter_templates/cookiecutter-fprime-deployment/{{cookiecutter.deployment_name}}/Top/{{cookiecutter.deployment_name}}Topology.cpp b/src/fprime/cookiecutter_templates/cookiecutter-fprime-deployment/{{cookiecutter.deployment_name}}/Top/{{cookiecutter.deployment_name}}Topology.cpp
index 32b4217..6f8101d 100644
--- a/src/fprime/cookiecutter_templates/cookiecutter-fprime-deployment/{{cookiecutter.deployment_name}}/Top/{{cookiecutter.deployment_name}}Topology.cpp
+++ b/src/fprime/cookiecutter_templates/cookiecutter-fprime-deployment/{{cookiecutter.deployment_name}}/Top/{{cookiecutter.deployment_name}}Topology.cpp
@@ -115,6 +115,9 @@ void teardownTopology(const TopologyState& state) {
     // Other task clean-up.
 {%- if cookiecutter.com_driver_type == "UART" %}
     comDriver.quitReadThread();
+{%- elif cookiecutter.com_driver_type == "TcpServer" %}
+    comDriver.terminate();
+    comDriver.stop();
 {%- else %}
     comDriver.stop();
 {%- endif %}