diff --git a/FROST-Server.SQLjooq/src/main/java/de/fraunhofer/iosb/ilt/frostserver/persistence/pgjooq/tables/StaTableAbstract.java b/FROST-Server.SQLjooq/src/main/java/de/fraunhofer/iosb/ilt/frostserver/persistence/pgjooq/tables/StaTableAbstract.java
index 60a474542..8fc18c146 100644
--- a/FROST-Server.SQLjooq/src/main/java/de/fraunhofer/iosb/ilt/frostserver/persistence/pgjooq/tables/StaTableAbstract.java
+++ b/FROST-Server.SQLjooq/src/main/java/de/fraunhofer/iosb/ilt/frostserver/persistence/pgjooq/tables/StaTableAbstract.java
@@ -471,14 +471,13 @@ public EntityChangedMessage updateInDatabase(JooqPersistenceManager pm, Entity e
             hookWrapper.getObject().postUpdateInDatabase(pm, entity, entityId, updateMode);
         }
 
-        if (result == null) {
-            return message;
-        }
         Entity newEntity = new DefaultEntity(entityType, entity.getPrimaryKeyValues());
         message.setEntity(newEntity);
 
-        for (PropertyFields<T> sp : propertyFields) {
-            sp.converter.convert(thisTable, result, newEntity, dataSize);
+        if (result != null) {
+            for (PropertyFields<T> sp : propertyFields) {
+                sp.converter.convert(thisTable, result, newEntity, dataSize);
+            }
         }
 
         return message;