diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index 1e5a22a1e..75cecdcef 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -742,7 +742,9 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
 
     short id = 0;
     for (DeployBeanDescriptor<?> desc : deployDescriptors) {
-      desc.setProfileId(++id);
+      if (!desc.isEmbedded()) {
+        desc.setProfileId(++id);
+      }
     }
   }