diff --git a/src/MPDevice.cpp b/src/MPDevice.cpp
index f4ed3cff..411f68f0 100644
--- a/src/MPDevice.cpp
+++ b/src/MPDevice.cpp
@@ -4354,6 +4354,13 @@ void MPDevice::setDataNode(const QString &service, const QByteArray &nodeData,
         {
             getChangeNumbers();
         }
+        else
+        {
+            set_credentialsDbChangeNumber(0);
+            credentialsDbChangeNumberClone = 0;
+            set_dataDbChangeNumber(0);
+            dataDbChangeNumberClone = 0;
+        }
     });
 
     connect(jobs, &AsyncJobs::failed, [=](AsyncJob *failedJob)
@@ -6048,6 +6055,10 @@ void MPDevice::startIntegrityCheck(std::function<void(bool success, QString errs
         /* Check loaded nodes, set bool to repair */
         checkLoadedNodes(true, true, true);
 
+        /* set clone change number to actual, to prevent change number changes on device */
+        credentialsDbChangeNumberClone = get_credentialsDbChangeNumber();
+        dataDbChangeNumberClone = get_dataDbChangeNumber();
+
         /* Generate save packets */
         bool packets_generated = generateSavePackets(repairJobs, true, true, [](QVariantMap){});