diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/PumpSync.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/PumpSync.kt
index f7a6acb102..4a6662608f 100644
--- a/core/src/main/java/info/nightscout/androidaps/interfaces/PumpSync.kt
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/PumpSync.kt
@@ -58,7 +58,7 @@ interface PumpSync {
      *                  temporaryBasal (and extendedBolus) is null if there is no record in progress based on data in database
      *                  bolus is null when there is no record in database
      */
-    data class PumpState(val temporaryBasal: TemporaryBasal?, val extendedBolus: ExtendedBolus?, val bolus: Bolus?, val profile: Profile?) {
+    data class PumpState(val temporaryBasal: TemporaryBasal?, val extendedBolus: ExtendedBolus?, val bolus: Bolus?, val profile: Profile?, val serialNumber: String) {
 
         data class TemporaryBasal @JvmOverloads constructor(
             val timestamp: Long,
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/pump/PumpSyncImplementation.kt b/core/src/main/java/info/nightscout/androidaps/plugins/pump/PumpSyncImplementation.kt
index 66b7112b96..820e119063 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/pump/PumpSyncImplementation.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/pump/PumpSyncImplementation.kt
@@ -124,7 +124,8 @@ class PumpSyncImplementation @Inject constructor(
                     )
                 }
             else null,
-            profile = profileFunction.getProfile()
+            profile = profileFunction.getProfile(),
+            serialNumber = sp.getString(R.string.key_active_pump_serial_number, "")
         )
     }
 
diff --git a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsOmnipodErosManager.java b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsOmnipodErosManager.java
index 58bb9c8ee9..6fd73bb13c 100644
--- a/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsOmnipodErosManager.java
+++ b/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsOmnipodErosManager.java
@@ -733,7 +733,7 @@ public class AapsOmnipodErosManager {
                     PumpSync.TemporaryBasalType.EMULATED_PUMP_SUSPEND,
                     pumpId,
                     PumpType.OMNIPOD_EROS,
-                    serialNumber()
+                    pumpSync.expectedPumpState().getSerialNumber()
             );
         }
     }