diff --git a/exposed-dao/src/main/kotlin/org/jetbrains/exposed/dao/EntityClass.kt b/exposed-dao/src/main/kotlin/org/jetbrains/exposed/dao/EntityClass.kt
index 789d32fb2b..5052ada7bb 100644
--- a/exposed-dao/src/main/kotlin/org/jetbrains/exposed/dao/EntityClass.kt
+++ b/exposed-dao/src/main/kotlin/org/jetbrains/exposed/dao/EntityClass.kt
@@ -55,7 +55,7 @@ abstract class EntityClass<ID : Comparable<ID>, out T : Entity<ID>>(val table: I
             }
         }
         removeFromCache(entity)
-        return findById(entity.id)
+        return if (entity.id._value != null) findById(entity.id) else null
     }
 
     internal open fun invalidateEntityInCache(o: Entity<ID>) {