diff --git a/klipper/klipper.cpp b/klipper/klipper.cpp
--- a/klipper/klipper.cpp
+++ b/klipper/klipper.cpp
@@ -603,7 +603,16 @@
     }
     Ignore lock( m_locklevel );
     HistoryItemPtr item = HistoryItem::create( clipData );
-    if (clipData->data(QStringLiteral("x-kde-passwordManagerHint")) != QByteArrayLiteral("secret")) {
+
+    bool saveHistory = true;
+    if (clipData->data(QStringLiteral("x-kde-passwordManagerHint")) == QByteArrayLiteral("secret")) {
+        saveHistory = false;
+    }
+    if (clipdata->hasImage() && m_bIgnoreImages) {
+        saveHistory = false;
+    }
+
+    if (saveHistory) {
         history()->insert( item );
     }
     return item;
@@ -732,7 +741,7 @@
         ; // ok
     else if( data->hasImage() )
     {
-        if( m_bIgnoreImages )
+        if (!data->hasFormat(QStringLiteral("x-kde-force-image-copy")))
             return;
     }
     else // unknown, ignore