diff --git a/app/src/main/java/info/nightscout/android/medtronic/service/MedtronicCnlIntentService.java b/app/src/main/java/info/nightscout/android/medtronic/service/MedtronicCnlIntentService.java
index c6af1ca3b36f42b1fa0ec86d072723b4ca1967a2..2a332a9c4ac678c1529996dc50de035eccab830e 100644
--- a/app/src/main/java/info/nightscout/android/medtronic/service/MedtronicCnlIntentService.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/service/MedtronicCnlIntentService.java
@@ -311,10 +311,8 @@ public class MedtronicCnlIntentService extends IntentService {
                     }
                     realm.close();
                 }
-                // TODO - set status if offline or Nightscout not reachable
-                sendToXDrip();
-                uploadToNightscout();
 
+                uploadPollResults();
                 scheduleNextPoll(timePollStarted, timeLastGoodSGV, pollInterval, df);
             }
         } finally {
@@ -386,6 +384,12 @@ public class MedtronicCnlIntentService extends IntentService {
             alarm.set(AlarmManager.RTC_WAKEUP, wakeTime, pendingIntent);
     }
 
+    private void uploadPollResults() {
+        // TODO - set status if offline or Nightscout not reachable
+        sendToXDrip();
+        uploadToNightscout();
+    }
+
     private void sendToXDrip() {
         final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
         if (prefs.getBoolean(getString(R.string.preference_enable_xdrip_plus), false)) {