diff --git a/src/main/java/name/nathanmcrae/numbersstation/MainController.java b/src/main/java/name/nathanmcrae/numbersstation/MainController.java
index 168a8a7..097b3ee 100644
--- a/src/main/java/name/nathanmcrae/numbersstation/MainController.java
+++ b/src/main/java/name/nathanmcrae/numbersstation/MainController.java
@@ -171,8 +171,12 @@ public class MainController implements Initializable {
             .findFirst()
             .orElse(null);
 
+        // TODO: if there are no stations, then create a default station and select that
+
         if (selectedStation == null) {
-            // TODO: create a new station and save it?
+            logger.log(Level.SEVERE, "Selected station '" + selectedStationName.get() + "' not found");
+            selectedStation = settings.getStations().get(0);
+            selectedStationName.set(selectedStation.getName());
         }
 
         messageTextArea.addEventFilter(KeyEvent.ANY, event -> {