diff --git a/android/app/src/main/java/com/microsoft/codepush/react/CodePushNativeModule.java b/android/app/src/main/java/com/microsoft/codepush/react/CodePushNativeModule.java
index e332dc6..a564e11 100644
--- a/android/app/src/main/java/com/microsoft/codepush/react/CodePushNativeModule.java
+++ b/android/app/src/main/java/com/microsoft/codepush/react/CodePushNativeModule.java
@@ -32,22 +32,27 @@ import java.util.HashMap;
 import java.util.Map;
 
 public class CodePushNativeModule extends ReactContextBaseJavaModule {
+    private String mClientUniqueId = null;    
     private LifecycleEventListener mLifecycleEventListener = null;
     private int mMinimumBackgroundDuration = 0;
+    
     private CodePush mCodePush;
-    private CodePushUpdateManager mUpdateManager;
-    private CodePushTelemetryManager mTelemetryManager;
     private SettingsManager mSettingsManager;
+    private CodePushTelemetryManager mTelemetryManager;
+    private CodePushUpdateManager mUpdateManager;
 
     private static final String REACT_APPLICATION_CLASS_NAME = "com.facebook.react.ReactApplication";
     private static final String REACT_NATIVE_HOST_CLASS_NAME = "com.facebook.react.ReactNativeHost";
 
     public CodePushNativeModule(ReactApplicationContext reactContext, CodePush codePush, CodePushUpdateManager codePushUpdateManager, CodePushTelemetryManager codePushTelemetryManager, SettingsManager settingsManager) {
         super(reactContext);
+
         mCodePush = codePush;
-        mUpdateManager = codePushUpdateManager;
-        mTelemetryManager = codePushTelemetryManager;
         mSettingsManager = settingsManager;
+        mTelemetryManager = codePushTelemetryManager;
+        mUpdateManager = codePushUpdateManager;
+
+        mClientUniqueId = Settings.Secure.getString(reactContext.getContentResolver(), Settings.Secure.ANDROID_ID);
     }
 
     @Override
@@ -242,15 +247,12 @@ public class CodePushNativeModule extends ReactContextBaseJavaModule {
     public void getConfiguration(Promise promise) {
         WritableNativeMap configMap = new WritableNativeMap();
         configMap.putString("appVersion", mCodePush.getAppVersion());
+        configMap.putString("clientUniqueId", mClientUniqueId);
         configMap.putString("deploymentKey", mCodePush.getDeploymentKey());
         configMap.putString("serverUrl", mCodePush.getServerUrl());
 
         Activity currentActivity = getCurrentActivity();
         if (currentActivity != null) {
-            configMap.putString("clientUniqueId",
-                    Settings.Secure.getString(currentActivity.getContentResolver(),
-                            android.provider.Settings.Secure.ANDROID_ID));
-
             String binaryHash = CodePushUpdateUtils.getHashForBinaryContents(currentActivity, mCodePush.isDebugMode());
             if (binaryHash != null) {
                 // binaryHash will be null if the React Native assets were not bundled into the APK