diff --git a/packages/strapi-plugin-content-type-builder/services/ContentTypeBuilder.js b/packages/strapi-plugin-content-type-builder/services/ContentTypeBuilder.js
index da2d11eaee..43c82a6c53 100755
--- a/packages/strapi-plugin-content-type-builder/services/ContentTypeBuilder.js
+++ b/packages/strapi-plugin-content-type-builder/services/ContentTypeBuilder.js
@@ -215,8 +215,8 @@ module.exports = {
         attr.via = relation.key;
         attr.dominant = relation.dominant;
 
-        if (relation.pluginValue) {
-          attr.plugin = relation.pluginValue;
+        if (_.trim(relation.pluginValue)) {
+          attr.plugin = _.trim(relation.pluginValue);
         }
 
         attrs[attribute.name] = attr;
@@ -366,7 +366,10 @@ module.exports = {
 
             attr.via = name;
             attr.columnName = params.targetColumnName;
-            attr.plugin = source;
+
+            if (_.trim(source)) {
+              attr.plugin = _.trim(source);
+            }
 
             modelJSON.attributes[params.key] = attr;