diff --git a/app/src/main/java/info/nightscout/android/upload/nightscout/NightscoutUploadIntentService.java b/app/src/main/java/info/nightscout/android/upload/nightscout/NightscoutUploadIntentService.java
index 76bb03b6d5980fef742b4ff2644fd91805db131e..188ed1c704b88fc3a6af81768739eb8fef99f00a 100644
--- a/app/src/main/java/info/nightscout/android/upload/nightscout/NightscoutUploadIntentService.java
+++ b/app/src/main/java/info/nightscout/android/upload/nightscout/NightscoutUploadIntentService.java
@@ -257,11 +257,13 @@ public class NightscoutUploadIntentService extends IntentService {
         iob.put("bolusiob", record.getActiveInsulin());
 
         JSONObject status = new JSONObject();
-        // todo put real status in here....
-        status.put("status", "normal");
-        status.put("timestamp", record.getPumpDate());
-        status.put("bolusing", record.isBolusing());
-        status.put("suspended", record.isSuspended());
+        if (record.isBolusing()) {
+            status.put("bolusing", true);
+        } else if (record.isSuspended()) {
+            status.put("suspended", true);
+        } else {
+            status.put("status", "normal");
+        }
 
         JSONObject battery = new JSONObject();
         battery.put("percent", record.getBatteryPercentage());