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 caca22e3..1f092716 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
@@ -157,9 +157,6 @@ void setupTopology(const TopologyState& state) {
         Os::TaskString name("ReceiveTask");
         // Uplink is configured for receive so a socket task is started
         comDriver.configure(state.hostname, state.port);
-{%-     if (cookiecutter.com_driver_type == "TcpServer") %}
-        comDriver.startup();
-{%-     endif %}
         comDriver.startSocketTask(name, true, COMM_PRIORITY, Default::STACK_SIZE);
     }
 {%- elif cookiecutter.com_driver_type == "UART" %}
@@ -212,9 +209,6 @@ void teardownTopology(const TopologyState& state) {
     comDriver.quitReadThread();
     (void)comDriver.join(nullptr);
 {%- else %}
-    {%- if (cookiecutter.com_driver_type == "TcpServer") %}
-    comDriver.shutdown();
-    {%- endif %}
     comDriver.stopSocketTask();
     (void)comDriver.joinSocketTask(nullptr);
 {%- endif %}