diff --git a/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/LispChannelHandler.java b/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/LispChannelHandler.java
index 5f809bf..2a7b740 100644
--- a/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/LispChannelHandler.java
+++ b/protocols/lisp/ctl/src/main/java/org/onosproject/lisp/ctl/LispChannelHandler.java
@@ -57,7 +57,7 @@
             }
 
             if (msg instanceof LispMapRegister) {
-                LispMapServer mapServer = new LispMapServer();
+                LispMapServer mapServer = LispMapServer.getInstance();
                 LispMapNotify mapNotify =
                         mapServer.processMapRegister((LispMapRegister) msg);
 
@@ -65,7 +65,7 @@
             }
 
             if (msg instanceof LispInfoRequest) {
-                LispMapServer mapServer = new LispMapServer();
+                LispMapServer mapServer = LispMapServer.getInstance();
                 LispInfoReply infoReply = mapServer.processInfoRequest((LispInfoRequest) msg);
 
                 ctx.writeAndFlush(infoReply);