diff --git a/apps/sdnip/src/main/java/org/onlab/onos/sdnip/IntentSynchronizer.java b/apps/sdnip/src/main/java/org/onlab/onos/sdnip/IntentSynchronizer.java
index 727c8ee..e9b6940 100644
--- a/apps/sdnip/src/main/java/org/onlab/onos/sdnip/IntentSynchronizer.java
+++ b/apps/sdnip/src/main/java/org/onlab/onos/sdnip/IntentSynchronizer.java
@@ -105,6 +105,12 @@
             }
 
             //
+            // NOTE: We don't withdraw the intents during shutdown, because
+            // it creates flux in the data plane during switchover.
+            //
+
+            /*
+            //
             // Build a batch operation to withdraw all intents from this
             // application.
             //
@@ -136,6 +142,7 @@
             peerIntents.clear();
             routeIntents.clear();
             log.debug("SDN-IP Intent Synchronizer shutdown completed");
+            */
         }
     }