diff --git a/OpenHaystack/OpenHaystack/HaystackApp/Model/PreviewData.swift b/OpenHaystack/OpenHaystack/HaystackApp/Model/PreviewData.swift
index 0a45976..faa6c3d 100644
--- a/OpenHaystack/OpenHaystack/HaystackApp/Model/PreviewData.swift
+++ b/OpenHaystack/OpenHaystack/HaystackApp/Model/PreviewData.swift
@@ -35,6 +35,8 @@ struct PreviewData {
         accessory.lastLocation = randomLocation()
         accessory.locationTimestamp = randomTimestamp()
         accessory.isDeployed = true
+        accessory.isActive = true
+        accessory.isNearby = Bool.random()
         return accessory
     }
 
diff --git a/OpenHaystack/OpenHaystack/OpenHaystackApp.swift b/OpenHaystack/OpenHaystack/OpenHaystackApp.swift
index 2a4279d..f4bb2cc 100644
--- a/OpenHaystack/OpenHaystack/OpenHaystackApp.swift
+++ b/OpenHaystack/OpenHaystack/OpenHaystackApp.swift
@@ -12,17 +12,18 @@ import SwiftUI
 @main
 struct OpenHaystackApp: App {
     @StateObject var accessoryController: AccessoryController
-    var accessoryNearbyMonitor: AccessoryNearbyMonitor
+    var accessoryNearbyMonitor: AccessoryNearbyMonitor?
 
     init() {
         let accessoryController: AccessoryController
         if ProcessInfo().arguments.contains("-preview") {
             accessoryController = AccessoryControllerPreview(accessories: PreviewData.accessories, findMyController: FindMyController())
+            self.accessoryNearbyMonitor = nil
         } else {
             accessoryController = AccessoryController()
+            self.accessoryNearbyMonitor = AccessoryNearbyMonitor(accessoryController: accessoryController)
         }
         self._accessoryController = StateObject(wrappedValue: accessoryController)
-        self.accessoryNearbyMonitor = AccessoryNearbyMonitor(accessoryController: accessoryController)
     }
 
     var body: some Scene {