diff --git a/core/src/console/connect_to_director.cc b/core/src/console/connect_to_director.cc
index c15a00cff02..f2ab09cd58c 100644
--- a/core/src/console/connect_to_director.cc
+++ b/core/src/console/connect_to_director.cc
@@ -70,9 +70,6 @@ BareosSocket* ConnectToDirector(JobControlRecord& jcr,
     local_tls_resource = director_resource;
   }
 
-  UA_sock->EnableNetworkMessagesDump(own_resource,
-                                                   director_resource);
-
   if (local_tls_resource->IsTlsConfigured()) {
     std::string qualified_resource_name;
     if (!my_config->GetQualifiedResourceNameTypeConverter()->ResourceToString(
diff --git a/core/src/dird/fd_cmds.cc b/core/src/dird/fd_cmds.cc
index 3f0a008d205..6490872d5cd 100644
--- a/core/src/dird/fd_cmds.cc
+++ b/core/src/dird/fd_cmds.cc
@@ -268,8 +268,6 @@ bool ConnectToFileDaemon(JobControlRecord* jcr,
 
     if (jcr->file_bsock) {
       jcr->setJobStatus(JS_Running);
-      jcr->file_bsock->EnableNetworkMessagesDump(me,
-                                                               jcr->res.client);
       if (AuthenticateWithFileDaemon(jcr)) {
         success = true;
         SendInfoSuccess(jcr, ua);
diff --git a/core/src/dird/sd_cmds.cc b/core/src/dird/sd_cmds.cc
index cc4e51dc16d..62d81903119 100644
--- a/core/src/dird/sd_cmds.cc
+++ b/core/src/dird/sd_cmds.cc
@@ -143,8 +143,6 @@ bool ConnectToStorageDaemon(JobControlRecord* jcr,
     }
   }
 
-  sd->EnableNetworkMessagesDump(me, store);
-
   if (!AuthenticateWithStorageDaemon(sd.get(), jcr, store)) {
     sd->close();
     return false;
diff --git a/core/src/dird/socket_server.cc b/core/src/dird/socket_server.cc
index ce790a660e5..6b49d9d2321 100644
--- a/core/src/dird/socket_server.cc
+++ b/core/src/dird/socket_server.cc
@@ -121,11 +121,9 @@ static void* HandleConnectionRequest(ConfigurationParser* config, void* arg)
       (sscanf(bs->msg, hello_client, name) == 1)) {
     Dmsg1(110, "Got a FD connection at %s\n",
           bstrftimes(tbuf, sizeof(tbuf), (utime_t)time(NULL)));
-    bs->EnableNetworkMessagesDump(*my_config, R_CLIENT);
     return HandleFiledConnection(client_connections, bs, name,
                                  fd_protocol_version);
   }
-  bs->EnableNetworkMessagesDump(*my_config, R_CONSOLE);
   return HandleUserAgentClientRequest(bs);
 }
 
diff --git a/core/src/filed/dir_cmd.cc b/core/src/filed/dir_cmd.cc
index 1200a80c580..8d00ddcc70e 100644
--- a/core/src/filed/dir_cmd.cc
+++ b/core/src/filed/dir_cmd.cc
@@ -1694,9 +1694,6 @@ static bool StorageCmd(JobControlRecord* jcr)
     }
   }
 
-  storage_daemon_socket->EnableNetworkMessagesDump(*my_config,
-                                                                 R_STORAGE);
-
   storage_daemon_socket->fsend("Hello Start Job %s\n", jcr->Job);
   if (!AuthenticateWithStoragedaemon(jcr)) {
     Jmsg(jcr, M_FATAL, 0, _("Failed to authenticate Storage daemon.\n"));
@@ -2321,8 +2318,6 @@ static BareosSocket* connect_to_director(JobControlRecord* jcr,
     }
   }
 
-  director_socket->EnableNetworkMessagesDump(me, dir_res);
-
   Dmsg1(10, "Opened connection with Director %s\n", dir_res->resource_name_);
   jcr->dir_bsock = director_socket.get();
 
diff --git a/core/src/filed/socket_server.cc b/core/src/filed/socket_server.cc
index 7ad9a15eb8d..ff521ea6a06 100644
--- a/core/src/filed/socket_server.cc
+++ b/core/src/filed/socket_server.cc
@@ -88,7 +88,6 @@ static void* HandleConnectionRequest(ConfigurationParser* config, void* arg)
   if (bstrncmp(bs->msg, "Hello Director", 14)) {
     Dmsg1(110, "Got a DIR connection at %s\n",
           bstrftimes(tbuf, sizeof(tbuf), (utime_t)time(NULL)));
-    bs->EnableNetworkMessagesDump(*my_config, R_DIRECTOR);
     return handle_director_connection(bs);
   }
 
@@ -98,7 +97,6 @@ static void* HandleConnectionRequest(ConfigurationParser* config, void* arg)
   if (bstrncmp(bs->msg, "Hello Storage", 13)) {
     Dmsg1(110, "Got a SD connection at %s\n",
           bstrftimes(tbuf, sizeof(tbuf), (utime_t)time(NULL)));
-    bs->EnableNetworkMessagesDump(*my_config, R_STORAGE);
     return handle_stored_connection(bs);
   }
 
diff --git a/core/src/stored/dir_cmd.cc b/core/src/stored/dir_cmd.cc
index bad2a92f3a5..b80fb5873ad 100644
--- a/core/src/stored/dir_cmd.cc
+++ b/core/src/stored/dir_cmd.cc
@@ -1695,8 +1695,6 @@ static bool ReplicateCmd(JobControlRecord* jcr)
   }
 
   jcr->store_bsock = storage_daemon_socket.get();
-  jcr->store_bsock->EnableNetworkMessagesDump(*my_config,
-                                                            R_STORAGE);
 
   storage_daemon_socket->fsend("Hello Start Storage Job %s\n", JobName);
 
@@ -1786,8 +1784,6 @@ static bool PassiveCmd(JobControlRecord* jcr)
     }
   }
 
-  fd->EnableNetworkMessagesDump(*my_config, R_CLIENT);
-
   jcr->file_bsock = fd;
   fd->fsend("Hello Storage calling Start Job %s\n", jcr->Job);
   if (!AuthenticateWithFiledaemon(jcr)) {
diff --git a/core/src/stored/socket_server.cc b/core/src/stored/socket_server.cc
index 8d89306a88c..e17254c0a89 100644
--- a/core/src/stored/socket_server.cc
+++ b/core/src/stored/socket_server.cc
@@ -107,7 +107,6 @@ void* HandleConnectionRequest(ConfigurationParser* config, void* arg)
   if (sscanf(bs->msg, "Hello Start Job %127s", name) == 1) {
     Dmsg1(110, "Got a FD connection at %s\n",
           bstrftimes(tbuf, sizeof(tbuf), (utime_t)time(NULL)));
-    bs->EnableNetworkMessagesDump(*my_config, R_CLIENT);
     return HandleFiledConnection(bs, name);
   }
 
@@ -117,15 +116,12 @@ void* HandleConnectionRequest(ConfigurationParser* config, void* arg)
   if (sscanf(bs->msg, "Hello Start Storage Job %127s", name) == 1) {
     Dmsg1(110, "Got a SD connection at %s\n",
           bstrftimes(tbuf, sizeof(tbuf), (utime_t)time(NULL)));
-    bs->EnableNetworkMessagesDump(*my_config, R_STORAGE);
     return handle_stored_connection(bs, name);
   }
 
   Dmsg1(110, "Got a DIR connection at %s\n",
         bstrftimes(tbuf, sizeof(tbuf), (utime_t)time(NULL)));
 
-  bs->EnableNetworkMessagesDump(*my_config, R_DIRECTOR);
-
   return HandleDirectorConnection(bs);
 }