diff --git a/app/src/main/java/com/geeksville/mesh/model/UIState.kt b/app/src/main/java/com/geeksville/mesh/model/UIState.kt
index 619a068ca..baee8dd1f 100644
--- a/app/src/main/java/com/geeksville/mesh/model/UIState.kt
+++ b/app/src/main/java/com/geeksville/mesh/model/UIState.kt
@@ -560,7 +560,9 @@ class UIViewModel @Inject constructor(
 
     val waypoints = packetRepository.getWaypoints().mapLatest { list ->
         list.associateBy { packet -> packet.data.waypoint!!.id }
-            .filterValues { it.data.waypoint!!.expire > System.currentTimeMillis() / 1000 }
+            .filterValues {
+                it.data.waypoint!!.expire == 0 || it.data.waypoint!!.expire > System.currentTimeMillis() / 1000
+            }
     }
 
     fun generatePacketId(): Int? {
diff --git a/app/src/main/java/com/geeksville/mesh/ui/map/components/EditWaypointDialog.kt b/app/src/main/java/com/geeksville/mesh/ui/map/components/EditWaypointDialog.kt
index 0c5dfabbc..13edce87a 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/map/components/EditWaypointDialog.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/map/components/EditWaypointDialog.kt
@@ -89,11 +89,6 @@ internal fun EditWaypointDialog(
     val emoji = if (waypointInput.icon == 0) 128205 else waypointInput.icon
     var showEmojiPickerView by remember { mutableStateOf(false) }
 
-    // State to hold selected date and time
-    var selectedDate by remember { mutableStateOf("") }
-    var selectedTime by remember { mutableStateOf("") }
-    var epochTime by remember { mutableStateOf<Long?>(null) }
-
     // Get current context for dialogs
     val context = LocalContext.current
     val calendar = Calendar.getInstance()
@@ -124,6 +119,11 @@ internal fun EditWaypointDialog(
         SimpleDateFormat("hh:mm a", locale)
     }
 
+    // State to hold selected date and time
+    var selectedDate by remember { mutableStateOf(dateFormat.format(calendar.time)) }
+    var selectedTime by remember { mutableStateOf(timeFormat.format(calendar.time)) }
+    var epochTime by remember { mutableStateOf<Long?>(null) }
+
     if (!showEmojiPickerView) {
         AlertDialog(
             onDismissRequest = onDismissRequest,