diff --git a/src/main/java/de/hda/fbi/db2/controller/Controller.java b/src/main/java/de/hda/fbi/db2/controller/Controller.java
index f38751dcd45bd1e39d0f175d6e60a0e266d81b26..e72fe7281594d9b9c64d41079893a426aaec956f 100644
--- a/src/main/java/de/hda/fbi/db2/controller/Controller.java
+++ b/src/main/java/de/hda/fbi/db2/controller/Controller.java
@@ -189,7 +189,13 @@ public class Controller {
       return;
     }
 
-    lab02EntityManager.persistData();
+    String schemaGeneration = (String) lab02EntityManager.getEntityManager().getProperties()
+        .get("javax.persistence.schema-generation.database.action");
+
+    if (schemaGeneration.equals("drop-and-create") ||
+        schemaGeneration.equals("create")) {
+      lab02EntityManager.persistData();
+    }
     isPersisted = true;
   }