diff --git a/tap/extensions/http/go.sum b/tap/extensions/http/go.sum
index 459fe3fa8..d7824c2dc 100644
--- a/tap/extensions/http/go.sum
+++ b/tap/extensions/http/go.sum
@@ -6,9 +6,12 @@ github.com/orcaman/concurrent-map v0.0.0-20210501183033-44dafcb38ecc h1:Ak86L+yD
 github.com/orcaman/concurrent-map v0.0.0-20210501183033-44dafcb38ecc/go.mod h1:Lu3tH6HLW3feq74c2GC+jIMS/K2CFcDWnWD9XkenwhI=
 github.com/romana/rlog v0.0.0-20171115192701-f018bc92e7d7 h1:jkvpcEatpwuMF5O5LVxTnehj6YZ/aEZN4NWD/Xml4pI=
 github.com/romana/rlog v0.0.0-20171115192701-f018bc92e7d7/go.mod h1:KTrHyWpO1sevuXPZwyeZc72ddWRFqNSKDFl7uVWKpg0=
+golang.org/x/net v0.0.0-20210421230115-4e50805a0758 h1:aEpZnXcAmXkd6AvLb2OPt+EN1Zu/8Ne3pCqPjja5PXY=
+golang.org/x/net v0.0.0-20210421230115-4e50805a0758/go.mod h1:72T/g9IO56b78aLF+1Kcs5dz7/ng1VjMUvfKvpfy+jM=
 golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d h1:LO7XpTYMwTqxjLcGWPijK3vRXg1aWdlNOVOHRq45d7c=
 golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210420072515-93ed5bcd2bfe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
diff --git a/tap/extensions/http/lib/go.mod b/tap/extensions/http/lib/go.mod
index 17329bab2..c6946f48d 100644
--- a/tap/extensions/http/lib/go.mod
+++ b/tap/extensions/http/lib/go.mod
@@ -5,8 +5,7 @@ go 1.16
 require (
 	github.com/bradleyfalzon/tlsx v0.0.0-20170624122154-28fd0e59bac4
 	github.com/google/martian v2.1.0+incompatible
-	github.com/orcaman/concurrent-map v0.0.0-20210501183033-44dafcb38ecc
 	github.com/romana/rlog v0.0.0-20171115192701-f018bc92e7d7
-	golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d
+	golang.org/x/net v0.0.0-20210421230115-4e50805a0758
 	golang.org/x/text v0.3.7 // indirect
 )
diff --git a/tap/extensions/http/lib/matcher.go b/tap/extensions/http/lib/matcher.go
index f8754a515..4f1ca0ed1 100644
--- a/tap/extensions/http/lib/matcher.go
+++ b/tap/extensions/http/lib/matcher.go
@@ -4,9 +4,8 @@ import (
 	"fmt"
 	"net/http"
 	"strings"
+	"sync"
 	"time"
-
-	cmap "github.com/orcaman/concurrent-map"
 )
 
 var reqResMatcher = createResponseRequestMatcher() // global
@@ -24,11 +23,11 @@ type httpMessage struct {
 
 // Key is {client_addr}:{client_port}->{dest_addr}:{dest_port}
 type requestResponseMatcher struct {
-	openMessagesMap cmap.ConcurrentMap
+	openMessagesMap sync.Map
 }
 
 func createResponseRequestMatcher() requestResponseMatcher {
-	newMatcher := &requestResponseMatcher{openMessagesMap: cmap.New()}
+	newMatcher := &requestResponseMatcher{openMessagesMap: sync.Map{}}
 	return *newMatcher
 }
 
@@ -42,7 +41,7 @@ func (matcher *requestResponseMatcher) registerRequest(ident string, request *ht
 		orig:        request,
 	}
 
-	if response, found := matcher.openMessagesMap.Pop(key); found {
+	if response, found := matcher.openMessagesMap.LoadAndDelete(key); found {
 		// Type assertion always succeeds because all of the map's values are of httpMessage type
 		responseHTTPMessage := response.(*httpMessage)
 		if responseHTTPMessage.isRequest {
@@ -53,7 +52,7 @@ func (matcher *requestResponseMatcher) registerRequest(ident string, request *ht
 		return matcher.preparePair(&requestHTTPMessage, responseHTTPMessage)
 	}
 
-	matcher.openMessagesMap.Set(key, &requestHTTPMessage)
+	matcher.openMessagesMap.Store(key, &requestHTTPMessage)
 	Trace("Registered open Request for %s", key)
 	return nil
 }
@@ -68,7 +67,7 @@ func (matcher *requestResponseMatcher) registerResponse(ident string, response *
 		orig:        response,
 	}
 
-	if request, found := matcher.openMessagesMap.Pop(key); found {
+	if request, found := matcher.openMessagesMap.LoadAndDelete(key); found {
 		// Type assertion always succeeds because all of the map's values are of httpMessage type
 		requestHTTPMessage := request.(*httpMessage)
 		if !requestHTTPMessage.isRequest {
@@ -79,7 +78,7 @@ func (matcher *requestResponseMatcher) registerResponse(ident string, response *
 		return matcher.preparePair(requestHTTPMessage, &responseHTTPMessage)
 	}
 
-	matcher.openMessagesMap.Set(key, &responseHTTPMessage)
+	matcher.openMessagesMap.Store(key, &responseHTTPMessage)
 	Trace("Registered open Response for %s", key)
 	return nil
 }
@@ -102,21 +101,16 @@ func genKey(split []string) string {
 }
 
 func (matcher *requestResponseMatcher) deleteOlderThan(t time.Time) int {
-	keysToPop := make([]string, 0)
-	for item := range matcher.openMessagesMap.IterBuffered() {
-		// Map only contains values of type httpMessage
-		message, _ := item.Val.(*httpMessage)
+	numDeleted := 0
 
+	matcher.openMessagesMap.Range(func(key interface{}, value interface{}) bool {
+		message, _ := value.(*httpMessage)
 		if message.captureTime.Before(t) {
-			keysToPop = append(keysToPop, item.Key)
+			matcher.openMessagesMap.Delete(key)
+			numDeleted++
 		}
-	}
-
-	numDeleted := len(keysToPop)
-
-	for _, key := range keysToPop {
-		_, _ = matcher.openMessagesMap.Pop(key)
-	}
+		return true
+	})
 
 	return numDeleted
 }