diff --git a/tap/tlstapper/ssllib_finder.go b/tap/tlstapper/ssllib_finder.go
index 596772be7..3be5e18e6 100644
--- a/tap/tlstapper/ssllib_finder.go
+++ b/tap/tlstapper/ssllib_finder.go
@@ -46,7 +46,7 @@ func findLibraryByPid(procfs string, pid uint32, libraryName string) (string, er
 
 		filepath := parts[5]
 
-		if !strings.Contains(filepath, libraryName) {
+		if libraryName != "" && !strings.Contains(filepath, libraryName) {
 			continue
 		}
 
diff --git a/tap/tlstapper/tls_tapper.go b/tap/tlstapper/tls_tapper.go
index f52de9cae..f96bafb0a 100644
--- a/tap/tlstapper/tls_tapper.go
+++ b/tap/tlstapper/tls_tapper.go
@@ -1,8 +1,6 @@
 package tlstapper
 
 import (
-	"fmt"
-	"os"
 	"strconv"
 	"sync"
 
@@ -196,7 +194,7 @@ func (t *TlsTapper) tapSsllibPid(pid uint32, sslLibrary string, namespace string
 }
 
 func (t *TlsTapper) tapGolangPid(procfs string, pid uint32, namespace string) error {
-	exePath, err := os.Readlink(fmt.Sprintf("%s/%d/exe", procfs, pid))
+	exePath, err := findLibraryByPid(procfs, pid, "")
 	if err != nil {
 		return err
 	}