diff --git a/sdk-java/src/main/java/ly/count/sdk/java/internal/InternalConfig.java b/sdk-java/src/main/java/ly/count/sdk/java/internal/InternalConfig.java
index db8b2beab..4feaa721d 100644
--- a/sdk-java/src/main/java/ly/count/sdk/java/internal/InternalConfig.java
+++ b/sdk-java/src/main/java/ly/count/sdk/java/internal/InternalConfig.java
@@ -35,6 +35,8 @@ public final class InternalConfig extends Config implements Storable {
 
     ImmediateRequestGenerator immediateRequestGenerator = null;
 
+    final String DEVICE_ID_PREFIX = "CLY_";
+
     /**
      * Shouldn't be used!
      */
diff --git a/sdk-java/src/main/java/ly/count/sdk/java/internal/ModuleDeviceIdCore.java b/sdk-java/src/main/java/ly/count/sdk/java/internal/ModuleDeviceIdCore.java
index cccd21677..2b58fd560 100644
--- a/sdk-java/src/main/java/ly/count/sdk/java/internal/ModuleDeviceIdCore.java
+++ b/sdk-java/src/main/java/ly/count/sdk/java/internal/ModuleDeviceIdCore.java
@@ -4,7 +4,6 @@
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.Future;
-
 import ly.count.sdk.java.Config;
 
 /**
@@ -31,7 +30,7 @@ public boolean isAvailable() {
 
         @Override
         public String generate(CtxCore context) {
-            return UUID.randomUUID().toString();
+            return context.getConfig().DEVICE_ID_PREFIX + UUID.randomUUID();
         }
     }