diff --git a/bpf/go_grpc.c b/bpf/go_grpc.c
index ed3c73349..2201deabe 100644
--- a/bpf/go_grpc.c
+++ b/bpf/go_grpc.c
@@ -178,8 +178,13 @@ int uprobe_server_handleStream_return(struct pt_regs *ctx) {
     // Read the embedded object ptr
     bpf_probe_read(&st_ptr, sizeof(st_ptr), (void *)(stream_ptr + grpc_stream_st_ptr_pos + sizeof(void *)));
 
-    if (st_ptr) {
+    trace->host_len = 0;
+    trace->remote_addr_len = 0;
+    trace->host_port = 0;
+    __builtin_memset(trace->host, 0, sizeof(trace->host));    
+    __builtin_memset(trace->remote_addr, 0, sizeof(trace->remote_addr));
 
+    if (st_ptr) {        
         void *remote_addr = 0;
         void *local_addr = 0;
 
diff --git a/pkg/internal/ebpf/common/spanner.go b/pkg/internal/ebpf/common/spanner.go
index fe76ba1c0..83c82d80d 100644
--- a/pkg/internal/ebpf/common/spanner.go
+++ b/pkg/internal/ebpf/common/spanner.go
@@ -132,6 +132,12 @@ func extractHostPort(b []uint8) (string, int) {
 }
 
 func extractIP(b []uint8, size int) string {
+	// Temporary fix to avoid crashes if the data is not correct.
+	// We saw issues with peer location changes in grpc 1.60
+	if size < 0 || size > 4096 {
+		return ""
+	}
+
 	if size > len(b) {
 		size = len(b)
 	}
diff --git a/pkg/internal/ebpf/grpc/bpf_bpfel_arm64.o b/pkg/internal/ebpf/grpc/bpf_bpfel_arm64.o
index 5f6a8b6e4..7d013e72c 100644
Binary files a/pkg/internal/ebpf/grpc/bpf_bpfel_arm64.o and b/pkg/internal/ebpf/grpc/bpf_bpfel_arm64.o differ
diff --git a/pkg/internal/ebpf/grpc/bpf_bpfel_x86.o b/pkg/internal/ebpf/grpc/bpf_bpfel_x86.o
index 238c542dd..d59893f1d 100644
Binary files a/pkg/internal/ebpf/grpc/bpf_bpfel_x86.o and b/pkg/internal/ebpf/grpc/bpf_bpfel_x86.o differ
diff --git a/pkg/internal/ebpf/grpc/bpf_debug_bpfel_arm64.o b/pkg/internal/ebpf/grpc/bpf_debug_bpfel_arm64.o
index 68bf6c54e..51922ba09 100644
Binary files a/pkg/internal/ebpf/grpc/bpf_debug_bpfel_arm64.o and b/pkg/internal/ebpf/grpc/bpf_debug_bpfel_arm64.o differ
diff --git a/pkg/internal/ebpf/grpc/bpf_debug_bpfel_x86.o b/pkg/internal/ebpf/grpc/bpf_debug_bpfel_x86.o
index 7c8dd020a..dc3a9d312 100644
Binary files a/pkg/internal/ebpf/grpc/bpf_debug_bpfel_x86.o and b/pkg/internal/ebpf/grpc/bpf_debug_bpfel_x86.o differ
diff --git a/pkg/internal/ebpf/grpc/bpf_tp_bpfel_arm64.o b/pkg/internal/ebpf/grpc/bpf_tp_bpfel_arm64.o
index c741c5563..ef4c1a1f7 100644
Binary files a/pkg/internal/ebpf/grpc/bpf_tp_bpfel_arm64.o and b/pkg/internal/ebpf/grpc/bpf_tp_bpfel_arm64.o differ
diff --git a/pkg/internal/ebpf/grpc/bpf_tp_bpfel_x86.o b/pkg/internal/ebpf/grpc/bpf_tp_bpfel_x86.o
index 447fd4db1..c92f371fa 100644
Binary files a/pkg/internal/ebpf/grpc/bpf_tp_bpfel_x86.o and b/pkg/internal/ebpf/grpc/bpf_tp_bpfel_x86.o differ
diff --git a/pkg/internal/ebpf/grpc/bpf_tp_debug_bpfel_arm64.o b/pkg/internal/ebpf/grpc/bpf_tp_debug_bpfel_arm64.o
index d1121fd61..f1209cfac 100644
Binary files a/pkg/internal/ebpf/grpc/bpf_tp_debug_bpfel_arm64.o and b/pkg/internal/ebpf/grpc/bpf_tp_debug_bpfel_arm64.o differ
diff --git a/pkg/internal/ebpf/grpc/bpf_tp_debug_bpfel_x86.o b/pkg/internal/ebpf/grpc/bpf_tp_debug_bpfel_x86.o
index 4b0479db3..a4cb27817 100644
Binary files a/pkg/internal/ebpf/grpc/bpf_tp_debug_bpfel_x86.o and b/pkg/internal/ebpf/grpc/bpf_tp_debug_bpfel_x86.o differ