diff --git a/app/src/main/kotlin/app/dapk/st/graph/AppModule.kt b/app/src/main/kotlin/app/dapk/st/graph/AppModule.kt
index d51c69d..4dc6890 100644
--- a/app/src/main/kotlin/app/dapk/st/graph/AppModule.kt
+++ b/app/src/main/kotlin/app/dapk/st/graph/AppModule.kt
@@ -521,8 +521,7 @@ internal class AndroidImageContentReader(private val contentResolver: ContentRes
 
 internal class SmallTalkDeviceNameGenerator : DeviceDisplayNameGenerator {
     override fun generate(): String {
-        val allowedChars = ('A'..'Z') + ('a'..'z') + ('0'..'9')
-        val randomIdentifier = (1..4).map { allowedChars.random() }.joinToString("")
+        val randomIdentifier = (('A'..'Z') + ('a'..'z') + ('0'..'9')).shuffled().take(4).joinToString("")
         return "SmallTalk Android ($randomIdentifier)"
     }
 }
\ No newline at end of file