diff --git a/apps/cpman/app/src/main/java/org/onosproject/cpman/rest/CPManCodecRegistrator.java b/apps/cpman/app/src/main/java/org/onosproject/cpman/rest/CPManCodecRegistrator.java
index 2e78a4e7..aa7709c 100644
--- a/apps/cpman/app/src/main/java/org/onosproject/cpman/rest/CPManCodecRegistrator.java
+++ b/apps/cpman/app/src/main/java/org/onosproject/cpman/rest/CPManCodecRegistrator.java
@@ -47,6 +47,8 @@
 
     @Deactivate
     public void deactivate() {
+        codecService.unregisterCodec(ControlLoad.class);
+
         log.info("Stopped");
     }
 }