diff --git a/api/grpc/mpi/v1/command.pb.go b/api/grpc/mpi/v1/command.pb.go
index 1c4fa9b0c..39ef93489 100644
--- a/api/grpc/mpi/v1/command.pb.go
+++ b/api/grpc/mpi/v1/command.pb.go
@@ -8,7 +8,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.7
+// 	protoc-gen-go v1.36.8
 // 	protoc        (unknown)
 // source: mpi/v1/command.proto
 
diff --git a/api/grpc/mpi/v1/common.pb.go b/api/grpc/mpi/v1/common.pb.go
index 26b95bf14..890c2b073 100644
--- a/api/grpc/mpi/v1/common.pb.go
+++ b/api/grpc/mpi/v1/common.pb.go
@@ -5,7 +5,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.7
+// 	protoc-gen-go v1.36.8
 // 	protoc        (unknown)
 // source: mpi/v1/common.proto
 
diff --git a/api/grpc/mpi/v1/files.pb.go b/api/grpc/mpi/v1/files.pb.go
index c68585426..be249670c 100644
--- a/api/grpc/mpi/v1/files.pb.go
+++ b/api/grpc/mpi/v1/files.pb.go
@@ -5,7 +5,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.7
+// 	protoc-gen-go v1.36.8
 // 	protoc        (unknown)
 // source: mpi/v1/files.proto
 
diff --git a/internal/collector/otel_collector_plugin.go b/internal/collector/otel_collector_plugin.go
index 0ecc70af8..537ad7f29 100644
--- a/internal/collector/otel_collector_plugin.go
+++ b/internal/collector/otel_collector_plugin.go
@@ -709,6 +709,8 @@ func (oc *Collector) findAvailableSyslogServers(ctx context.Context, napSyslogSe
 
 		slog.DebugContext(ctx, "Found valid NAP syslog server", "address", napSyslogServer)
 
+		oc.previousNAPSysLogServer = napSyslogServer
+
 		return napSyslogServer
 	}
 
diff --git a/internal/collector/otel_collector_plugin_test.go b/internal/collector/otel_collector_plugin_test.go
index a59ba6f5b..89d01f05a 100644
--- a/internal/collector/otel_collector_plugin_test.go
+++ b/internal/collector/otel_collector_plugin_test.go
@@ -790,8 +790,6 @@ func TestCollector_findAvailableSyslogServers(t *testing.T) {
 	conf.Collector.Processors.Attribute = nil
 	conf.Collector.Processors.Resource = nil
 	conf.Collector.Processors.LogsGzip = nil
-	collector, err := NewCollector(conf)
-	require.NoError(t, err)
 
 	tests := []struct {
 		name                    string
@@ -835,10 +833,22 @@ func TestCollector_findAvailableSyslogServers(t *testing.T) {
 			syslogServers:           []string{"localhost:15632", "localhost:1122"},
 			portInUse:               true,
 		},
+		{
+			name:                    "Test 6: port hasn't changed",
+			expectedSyslogServer:    "localhost:1122",
+			previousNAPSysLogServer: "localhost:1122",
+			syslogServers:           []string{"localhost:1122"},
+			portInUse:               true,
+		},
 	}
 
 	for _, test := range tests {
 		t.Run(test.name, func(tt *testing.T) {
+			collector, err := NewCollector(conf)
+			require.NoError(t, err)
+
+			collector.previousNAPSysLogServer = test.previousNAPSysLogServer
+
 			if test.portInUse {
 				listenConfig := &net.ListenConfig{}
 				ln, listenError := listenConfig.Listen(ctx, "tcp", "localhost:15632")