diff --git a/apps/virtualbng/src/main/java/org/onosproject/virtualbng/VbngConfigurationManager.java b/apps/virtualbng/src/main/java/org/onosproject/virtualbng/VbngConfigurationManager.java
index 41ff0b4..fe0edd2 100644
--- a/apps/virtualbng/src/main/java/org/onosproject/virtualbng/VbngConfigurationManager.java
+++ b/apps/virtualbng/src/main/java/org/onosproject/virtualbng/VbngConfigurationManager.java
@@ -112,7 +112,8 @@
     // TODO handle the case: the number of public IP addresses is not enough
     // for 1:1 mapping from public IP to private IP.
     @Override
-    public IpAddress getAvailablePublicIpAddress(IpAddress privateIpAddress) {
+    public synchronized IpAddress getAvailablePublicIpAddress(IpAddress
+                                                           privateIpAddress) {
         // If there is already a mapping entry for the private IP address,
         // then fetch the public IP address in the mapping entry and return it.
         IpAddress publicIpAddress = ipAddressMap.get(privateIpAddress);
diff --git a/apps/virtualbng/src/main/java/org/onosproject/virtualbng/VbngResource.java b/apps/virtualbng/src/main/java/org/onosproject/virtualbng/VbngResource.java
index c38b7a7..9436981 100644
--- a/apps/virtualbng/src/main/java/org/onosproject/virtualbng/VbngResource.java
+++ b/apps/virtualbng/src/main/java/org/onosproject/virtualbng/VbngResource.java
@@ -47,10 +47,8 @@
         VbngService vbngService = get(VbngService.class);
 
         IpAddress publicIpAddress = null;
-        synchronized (this) {
-            // Create a virtual BNG
-            publicIpAddress = vbngService.createVbng(privateIpAddress);
-        }
+        // Create a virtual BNG
+        publicIpAddress = vbngService.createVbng(privateIpAddress);
 
         if (publicIpAddress != null) {
             return publicIpAddress.toString();