diff --git a/ElementX/Sources/Screens/AppLock/AppLockSetupPINScreen/View/AppLockSetupPINScreen.swift b/ElementX/Sources/Screens/AppLock/AppLockSetupPINScreen/View/AppLockSetupPINScreen.swift
index 22a80d7cb..6be416dbc 100644
--- a/ElementX/Sources/Screens/AppLock/AppLockSetupPINScreen/View/AppLockSetupPINScreen.swift
+++ b/ElementX/Sources/Screens/AppLock/AppLockSetupPINScreen/View/AppLockSetupPINScreen.swift
@@ -41,7 +41,7 @@ struct AppLockSetupPINScreen: View {
                 header
                 
                 PINTextField(pinCode: $context.pinCode,
-                             isSecure: context.viewState.mode == .unlock)
+                             isSecure: true)
                     .focused($textFieldFocus)
             }
             .padding(.horizontal, 16)
diff --git a/changelog.d/2145.change b/changelog.d/2145.change
new file mode 100644
index 000000000..2092ec718
--- /dev/null
+++ b/changelog.d/2145.change
@@ -0,0 +1 @@
+Hide pin code in lock screen setup mode
\ No newline at end of file