diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/gcm/GCMUtil.java b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/gcm/GCMUtil.java
index 12db04ec50..6e59b2d435 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/gcm/GCMUtil.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/gcm/GCMUtil.java
@@ -123,6 +123,9 @@ public class GCMUtil {
         //Set device reg-ids
         JsonArray regIds = new JsonArray();
         for (String regId : registrationIds) {
+            if (regId == null && regId.isEmpty()) {
+                continue;
+            }
             regIds.add(new JsonPrimitive(regId));
         }