diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddAckWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddAckWorker.kt
index 947d996ad3..72e4cf4a43 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddAckWorker.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddAckWorker.kt
@@ -4,7 +4,7 @@ import android.content.Context
 import android.os.SystemClock
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
-import info.nightscout.core.utils.notify
+import info.nightscout.core.utils.notifyAll
 import info.nightscout.core.utils.receivers.DataWorkerStorage
 import info.nightscout.core.utils.worker.LoggingWorker
 import info.nightscout.database.impl.AppRepository
@@ -180,7 +180,7 @@ class NSClientAddAckWorker(
             }
 
         }
-        ack.originalObject?.let { synchronized(it) { it.notify() } }
+        ack.originalObject?.let { synchronized(it) { it.notifyAll() } }
         return ret
     }
 }
\ No newline at end of file
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientUpdateRemoveAckWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientUpdateRemoveAckWorker.kt
index 49d135cafa..202478da61 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientUpdateRemoveAckWorker.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientUpdateRemoveAckWorker.kt
@@ -3,7 +3,7 @@ package info.nightscout.plugins.sync.nsclient.workers
 import android.content.Context
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
-import info.nightscout.core.utils.notify
+import info.nightscout.core.utils.notifyAll
 import info.nightscout.core.utils.receivers.DataWorkerStorage
 import info.nightscout.core.utils.worker.LoggingWorker
 import info.nightscout.database.impl.AppRepository
@@ -128,7 +128,7 @@ class NSClientUpdateRemoveAckWorker(
                 ret = Result.success(workDataOf("ProcessedData" to pair.toString()))
             }
         }
-        ack.originalObject?.let { synchronized(it) { it.notify() } }
+        ack.originalObject?.let { synchronized(it) { it.notifyAll() } }
         return ret
     }
 }
\ No newline at end of file
diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/SerialIOThread.java b/pump/danar/src/main/java/info/nightscout/androidaps/danar/SerialIOThread.java
index f1f2f9e671..ade2c41287 100644
--- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/SerialIOThread.java
+++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/SerialIOThread.java
@@ -81,7 +81,7 @@ public class SerialIOThread extends Thread {
                     message.setReceived(true);
                     message.handleMessage(extractedBuff);
                     synchronized (message) {
-                        message.notify();
+                        message.notifyAll();
                     }
                 }
             }
diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java b/pump/danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java
index 488a12e718..8ab9b84e12 100644
--- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java
+++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java
@@ -343,7 +343,7 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
                                 aapsLogger.debug(LTag.PUMP, "Bolus amount in history too old: " + dateUtil.dateAndTimeString(danaPump.getLastBolusTime()));
                             }
                             synchronized (o) {
-                                o.notify();
+                                o.notifyAll();
                             }
                         }
                     });
diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/services/BLEComm.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/services/BLEComm.kt
index 60af389f3f..3cda6682bc 100644
--- a/pump/danars/src/main/java/info/nightscout/pump/danars/services/BLEComm.kt
+++ b/pump/danars/src/main/java/info/nightscout/pump/danars/services/BLEComm.kt
@@ -21,7 +21,7 @@ import androidx.core.app.ActivityCompat
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 import info.nightscout.core.ui.toast.ToastUtils
-import info.nightscout.core.utils.notify
+import info.nightscout.core.utils.notifyAll
 import info.nightscout.core.utils.waitMillis
 import info.nightscout.interfaces.notifications.Notification
 import info.nightscout.interfaces.pump.PumpSync
@@ -863,7 +863,7 @@ class BLEComm @Inject internal constructor(
             message.setReceived()
             synchronized(message) {
                 // notify to sendMessage
-                message.notify()
+                message.notifyAll()
             }
         } else aapsLogger.error("Unknown message received " + DanaRSPacket.toHexString(decryptedBuffer))
     }
diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/service/BLECommonService.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/service/BLECommonService.kt
index 3664129047..a0622de82d 100644
--- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/service/BLECommonService.kt
+++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/service/BLECommonService.kt
@@ -18,7 +18,7 @@ import android.os.SystemClock
 import androidx.core.app.ActivityCompat
 import dagger.android.HasAndroidInjector
 import info.nightscout.core.ui.toast.ToastUtils
-import info.nightscout.core.utils.notify
+import info.nightscout.core.utils.notifyAll
 import info.nightscout.core.utils.waitMillis
 import info.nightscout.interfaces.ui.UiInteraction
 import info.nightscout.pump.diaconn.DiaconnG8Pump
@@ -406,7 +406,7 @@ class BLECommonService @Inject internal constructor(
             message!!.setReceived()
             synchronized(message!!) {
                 // notify to sendMessage
-                message!!.notify()
+                message!!.notifyAll()
             }
         } else aapsLogger.error("Unknown message received " + DiaconnG8Packet.toHex(data))
     }