diff --git a/compiler/src/main/kotlin/deezer/kustomexport/compiler/js/mapping/TypeMapping.kt b/compiler/src/main/kotlin/deezer/kustomexport/compiler/js/mapping/TypeMapping.kt
index 9b17a4f..7bca22b 100644
--- a/compiler/src/main/kotlin/deezer/kustomexport/compiler/js/mapping/TypeMapping.kt
+++ b/compiler/src/main/kotlin/deezer/kustomexport/compiler/js/mapping/TypeMapping.kt
@@ -45,9 +45,13 @@ class OriginTypeName(
     fun importedMethod(name: FormatString) = importMethod(name)
 
     val exportedTypeName: TypeName by lazy {
-        // Remove TypeParameter: because we can't export generic in a cool manner yet, so we produce concrete from generics.
-        // See @KustomExportGenerics
-        exportedType()
+        var type = exportedType()
+        if(isKustomExportAnnotated) {
+            // Remove TypeParameter: because we can't export generic in a cool manner yet, so we produce concrete from generics.
+            // See @KustomExportGenerics
+            type = type.removeTypeParameter()
+        }
+        type
     }
 
     fun exportedMethod(name: FormatString) = exportMethod(name)