diff --git a/src/servers/app/ServerPicture.cpp b/src/servers/app/ServerPicture.cpp
index 722f5bf5fd..00b417035f 100644
--- a/src/servers/app/ServerPicture.cpp
+++ b/src/servers/app/ServerPicture.cpp
@@ -778,11 +778,9 @@ ServerPicture::~ServerPicture()
 	delete fData;
 	gTokenSpace.RemoveToken(fToken);
 	
-	if (fPictures != NULL) {
-		for (int32 i = fPictures->CountItems() - 1; i >= 0; i--)
-			delete static_cast<ServerPicture *>(fPictures->ItemAtFast(i));		
-		delete fPictures;
-	}
+	// We don't delete the subpictures themselves, the ServerApp keeps
+	// them in a list and will delete them on quit.
+	delete fPictures;
 }