diff --git a/internal/bbsim/devices/olt.go b/internal/bbsim/devices/olt.go
index 8520bf2..ef95ad6 100644
--- a/internal/bbsim/devices/olt.go
+++ b/internal/bbsim/devices/olt.go
@@ -1034,7 +1034,7 @@
 
 	flowKey := FlowKey{}
 	if !o.enablePerf {
-		flowKey = FlowKey{ID: flow.FlowId, Direction: flow.FlowType}
+		flowKey = FlowKey{ID: flow.FlowId}
 		olt.Flows.Store(flowKey, *flow)
 	}
 
@@ -1151,11 +1151,7 @@
 	olt.freeAllocId(flow)
 
 	if !o.enablePerf { // remove only if flow were stored
-		flowKey := FlowKey{
-			ID:        flow.FlowId,
-			Direction: flow.FlowType,
-		}
-
+		flowKey := FlowKey{ID: flow.FlowId}
 		// Check if flow exists
 		storedFlowIntf, ok := o.Flows.Load(flowKey)
 		if !ok {