diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/services/DanaRSService.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/services/DanaRSService.java
index afb1392369..b71c5f4a8a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/services/DanaRSService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/services/DanaRSService.java
@@ -154,6 +154,7 @@ public class DanaRSService extends Service {
                 log.debug("Pump time difference: " + timeDiff + " seconds");
                 if (Math.abs(timeDiff) > 3) {
                     if (Math.abs(timeDiff) > 60*60*1.5) {
+                        log.debug("Pump time difference: " + timeDiff + " seconds - large difference");
                         //If time-diff is very large, warn user until we can synchronize history readings properly
                         Intent i = new Intent(MainApp.instance(), ErrorHelperActivity.class);
                         i.putExtra("soundid", R.raw.error);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/services/DanaRv2ExecutionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/services/DanaRv2ExecutionService.java
index b8071db202..eb4b1c5ccd 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/services/DanaRv2ExecutionService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/services/DanaRv2ExecutionService.java
@@ -209,10 +209,8 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
                 long timeDiff = (mDanaRPump.pumpTime.getTime() - System.currentTimeMillis()) / 1000L;
                 log.debug("Pump time difference: " + timeDiff + " seconds");
                 if (Math.abs(timeDiff) > 3) {
-                    waitForWholeMinute(); // Dana can set only whole minute
-                    // add 10sec to be sure we are over minute (will be cutted off anyway)
-                    mSerialIOThread.sendMessage(new MsgSetTime(new Date(DateUtil.now() + T.secs(10).msecs())));
                     if (Math.abs(timeDiff) > 60*60*1.5) {
+                        log.debug("Pump time difference: " + timeDiff + " seconds - large difference");
                         //If time-diff is very large, warn user until we can synchronize history readings properly
                         Intent i = new Intent(MainApp.instance(), ErrorHelperActivity.class);
                         i.putExtra("soundid", R.raw.error);
@@ -220,10 +218,14 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
                         i.putExtra("title", MainApp.gs(R.string.largetimedifftitle));
                         i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                         MainApp.instance().startActivity(i);
+                    } else {
+                        waitForWholeMinute(); // Dana can set only whole minute
+                        // add 10sec to be sure we are over minute (will be cutted off anyway)
+                        mSerialIOThread.sendMessage(new MsgSetTime(new Date(DateUtil.now() + T.secs(10).msecs())));
+                        mSerialIOThread.sendMessage(new MsgSettingPumpTime());
+                        timeDiff = (mDanaRPump.pumpTime.getTime() - System.currentTimeMillis()) / 1000L;
+                        log.debug("Pump time difference: " + timeDiff + " seconds");
                     }
-                    mSerialIOThread.sendMessage(new MsgSettingPumpTime());
-                    timeDiff = (mDanaRPump.pumpTime.getTime() - System.currentTimeMillis()) / 1000L;
-                    log.debug("Pump time difference: " + timeDiff + " seconds");
                 }
                 mDanaRPump.lastSettingsRead = now;
             }