diff --git a/libs/flake/KoShape.cpp b/libs/flake/KoShape.cpp
index 0b99e9e461a876389c82635e737ea2d1810f5c48..4c88e2ca512d6d0733eddf1c04b12dd148c9d174 100644
--- a/libs/flake/KoShape.cpp
+++ b/libs/flake/KoShape.cpp
@@ -404,8 +404,7 @@ void KoShape::notifyChanged()
 }
 
 void KoShape::setUserData(KoShapeUserData *userData) {
-    if(d->userData)
-        delete d->userData;
+    delete d->userData;
     d->userData = userData;
 }
 
@@ -414,7 +413,7 @@ KoShapeUserData *KoShape::userData() const {
 }
 
 void KoShape::setApplicationData(KoShapeApplicationData *appData) {
-    delete d->appData;
+    // appdata is deleted by the application.
     d->appData = appData;
 }