diff --git a/routingtable/adjRIBIn/adj_rib_in.go b/routingtable/adjRIBIn/adj_rib_in.go
index 48fc105ea3ae18047c417ecc47c612da9be159d5..319e28690170ae37df83ec2c480cea752b6ce7f1 100644
--- a/routingtable/adjRIBIn/adj_rib_in.go
+++ b/routingtable/adjRIBIn/adj_rib_in.go
@@ -69,7 +69,7 @@ func (a *AdjRIBIn) AddPath(pfx net.Prefix, p *route.Path) error {
 	defer a.mu.Unlock()
 
 	// RFC4456 Sect. 8: Ignore route with our RouterID as OriginatorID
-	if p.BGPPath.OriginatorID == 1 {
+	if p.BGPPath.OriginatorID == a.routerID {
 		return nil
 	}
 
diff --git a/routingtable/adjRIBIn/adj_rib_in_test.go b/routingtable/adjRIBIn/adj_rib_in_test.go
index a3a9cb5f5affcceda905ff362471980564e895d2..deec00104931a80f128be6782df70e35407775ae 100644
--- a/routingtable/adjRIBIn/adj_rib_in_test.go
+++ b/routingtable/adjRIBIn/adj_rib_in_test.go
@@ -82,7 +82,7 @@ func TestAddPath(t *testing.T) {
 					Type: route.BGPPathType,
 					BGPPath: &route.BGPPath{
 						LocalPref:    111,
-						OriginatorID: 1,
+						OriginatorID: routerID,
 					},
 				}),
 			},