diff --git a/src/jpgimage.cpp b/src/jpgimage.cpp
index 440c683e..d085d430 100644
--- a/src/jpgimage.cpp
+++ b/src/jpgimage.cpp
@@ -467,7 +467,8 @@ namespace Exiv2 {
         }
 
         if (exifData_.count() > 0) ++search;
-        if (xmpData_.count() > 0) ++search;
+        if (writeXmpFromPacket() == false && xmpData_.count() > 0) ++search;
+        if (writeXmpFromPacket() == true && xmpPacket_.size() > 0) ++search;
         if (iptcData_.count() > 0) ++search;
         if (!comment_.empty()) ++search;