diff --git a/lib/src/kdbx_object.dart b/lib/src/kdbx_object.dart
index 24b0b61..39881cd 100644
--- a/lib/src/kdbx_object.dart
+++ b/lib/src/kdbx_object.dart
@@ -191,8 +191,9 @@ abstract class KdbxObject extends KdbxNode {
     if (icon != null) {
       file.body.meta.addCustomIcon(icon);
       customIconUuid.set(icon.uuid);
+    } else {
+      customIconUuid.set(null);
     }
-    customIconUuid.set(null);
   }
 
   @override