diff --git a/protocols/lisp/api/src/main/java/org/onosproject/lisp/ctl/LispRouterFactory.java b/protocols/lisp/api/src/main/java/org/onosproject/lisp/ctl/LispRouterFactory.java
index 4dc9da1..bf7dfb6 100644
--- a/protocols/lisp/api/src/main/java/org/onosproject/lisp/ctl/LispRouterFactory.java
+++ b/protocols/lisp/api/src/main/java/org/onosproject/lisp/ctl/LispRouterFactory.java
@@ -58,12 +58,13 @@
      * Cleans up LISP router agent.
      */
     public void cleanAgent() {
-        synchronized (agent) {
-            if (this.agent != null) {
-                this.agent = null;
-            } else {
-                log.warn("LISP Router Agent is not configured.");
-            }
+        if (this.agent == null) {
+            log.warn("LISP Router Agent is not configured.");
+            return;
+        }
+        LispRouterAgent existingAgent = agent;
+        synchronized (existingAgent) {
+            this.agent = null;
         }
     }