diff --git a/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/OrganizationDecoratorPlugin.java b/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/OrganizationDecoratorPlugin.java
index 5d2225040..cb1b07e1d 100644
--- a/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/OrganizationDecoratorPlugin.java
+++ b/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/OrganizationDecoratorPlugin.java
@@ -18,9 +18,12 @@
  */
 package org.exoplatform.services.organization;
 
-@FunctionalInterface
 public interface OrganizationDecoratorPlugin<T> {
 
   T decorate(T obj);
 
+  default T undecorate(T obj) {
+    return obj;
+  }
+
 }