diff --git a/app/src/main/java/org/y20k/trackbook/dialogs/RenameTrackDialog.kt b/app/src/main/java/org/y20k/trackbook/dialogs/RenameTrackDialog.kt
index 0e700a5..542f3f2 100644
--- a/app/src/main/java/org/y20k/trackbook/dialogs/RenameTrackDialog.kt
+++ b/app/src/main/java/org/y20k/trackbook/dialogs/RenameTrackDialog.kt
@@ -64,7 +64,9 @@ class RenameTrackDialog (private var renameTrackListener: RenameTrackListener) {
         builder.setPositiveButton(R.string.dialog_rename_track_button) { _, _ ->
             // hand text over to initiating activity
             inputField.text?.let {
-                renameTrackListener.onRenameTrackDialog(it.toString())
+                var newStationName: String = it.toString()
+                if (newStationName.isEmpty()) newStationName = trackName
+                renameTrackListener.onRenameTrackDialog(newStationName)
             }
         }
 
diff --git a/build.gradle b/build.gradle
index a4fba51..b9279fa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,8 +2,8 @@
 
 buildscript {
     ext {
-        kotlin_version = '1.4.20'
-        navigation_version = '2.3.1'
+        kotlin_version = '1.4.21'
+        navigation_version = '2.3.2'
     }
     repositories {
         google()