diff --git a/app/src/main/java/app/myzel394/alibi/ui/components/SettingsScreen/atoms/BitrateTile.kt b/app/src/main/java/app/myzel394/alibi/ui/components/SettingsScreen/atoms/BitrateTile.kt
index 5e070f9..5472dd5 100644
--- a/app/src/main/java/app/myzel394/alibi/ui/components/SettingsScreen/atoms/BitrateTile.kt
+++ b/app/src/main/java/app/myzel394/alibi/ui/components/SettingsScreen/atoms/BitrateTile.kt
@@ -79,11 +79,11 @@ fun BitrateTile(
                         val bitRate = text?.toIntOrNull()
 
                         if (bitRate == null) {
-                            ValidationResult.Invalid(notNumberLabel)
+                            return@InputTextField ValidationResult.Invalid(notNumberLabel)
                         }
 
                         if (bitRate !in 1..320) {
-                            ValidationResult.Invalid(notInRangeLabel)
+                            return@InputTextField ValidationResult.Invalid(notInRangeLabel)
                         }
 
                         ValidationResult.Valid
@@ -92,7 +92,9 @@ fun BitrateTile(
                 )
             ),
         ) { result ->
-            val bitRate = result.getString("bitrate")?.toIntOrNull() ?: throw IllegalStateException("Bitrate is null")
+            val bitRate = result.getString("bitrate")?.toIntOrNull() ?: throw IllegalStateException(
+                "Bitrate is null"
+            )
 
             updateValue(bitRate * 1000)
         }
@@ -126,7 +128,7 @@ fun BitrateTile(
             ExampleListRoulette(
                 items = AudioRecorderSettings.EXAMPLE_BITRATE_VALUES,
                 onItemSelected = ::updateValue,
-            ) {bitRate ->
+            ) { bitRate ->
                 Text(
                     stringResource(
                         R.string.format_kbps,
diff --git a/app/src/main/java/app/myzel394/alibi/ui/components/SettingsScreen/atoms/SamplingRateTile.kt b/app/src/main/java/app/myzel394/alibi/ui/components/SettingsScreen/atoms/SamplingRateTile.kt
index c7a7352..53eb43c 100644
--- a/app/src/main/java/app/myzel394/alibi/ui/components/SettingsScreen/atoms/SamplingRateTile.kt
+++ b/app/src/main/java/app/myzel394/alibi/ui/components/SettingsScreen/atoms/SamplingRateTile.kt
@@ -60,7 +60,8 @@ fun SamplingRateTile(
         header = Header.Default(
             title = stringResource(R.string.ui_settings_option_samplingRate_title),
             icon = IconSource(
-                painter = IconResource.fromImageVector(Icons.Default.RadioButtonChecked).asPainterResource(),
+                painter = IconResource.fromImageVector(Icons.Default.RadioButtonChecked)
+                    .asPainterResource(),
                 contentDescription = null,
             )
         ),
@@ -79,11 +80,11 @@ fun SamplingRateTile(
                         val samplingRate = text?.toIntOrNull()
 
                         if (samplingRate == null) {
-                            ValidationResult.Invalid(notNumberLabel)
+                            return@InputTextField ValidationResult.Invalid(notNumberLabel)
                         }
 
-                        if (samplingRate!! <= 1000) {
-                            ValidationResult.Invalid(mustBeGreaterThanLabel)
+                        if (samplingRate <= 1000) {
+                            return@InputTextField ValidationResult.Invalid(mustBeGreaterThanLabel)
                         }
 
                         ValidationResult.Valid
@@ -92,7 +93,8 @@ fun SamplingRateTile(
                 )
             ),
         ) { result ->
-            val samplingRate = result.getString("samplingRate")?.toIntOrNull() ?: throw IllegalStateException("SamplingRate is null")
+            val samplingRate = result.getString("samplingRate")?.toIntOrNull()
+                ?: throw IllegalStateException("SamplingRate is null")
 
             updateValue(samplingRate)
         }
@@ -115,7 +117,8 @@ fun SamplingRateTile(
                 shape = MaterialTheme.shapes.medium,
             ) {
                 Text(
-                    (settings.audioRecorderSettings.samplingRate ?: stringResource(R.string.ui_settings_value_auto_label)).toString()
+                    (settings.audioRecorderSettings.samplingRate
+                        ?: stringResource(R.string.ui_settings_value_auto_label)).toString()
                 )
             }
         },
@@ -123,9 +126,10 @@ fun SamplingRateTile(
             ExampleListRoulette(
                 items = AudioRecorderSettings.EXAMPLE_SAMPLING_RATE,
                 onItemSelected = ::updateValue,
-            ) {samplingRate ->
+            ) { samplingRate ->
                 Text(
-                    (samplingRate ?: stringResource(R.string.ui_settings_value_auto_label)).toString()
+                    (samplingRate
+                        ?: stringResource(R.string.ui_settings_value_auto_label)).toString()
                 )
             }
         }