diff --git a/applications/system/application.fam b/applications/system/application.fam
index 2d4dfcbb8..d4d36908c 100644
--- a/applications/system/application.fam
+++ b/applications/system/application.fam
@@ -6,6 +6,7 @@ App(
         "updater_app",
         "storage_move_to_sd",
         "js_app",
+        "findmy_startup",
         # "archive",
     ],
 )
diff --git a/applications/system/findmy/application.fam b/applications/system/findmy/application.fam
index 2ef49310f..3edafeb62 100644
--- a/applications/system/findmy/application.fam
+++ b/applications/system/findmy/application.fam
@@ -13,3 +13,12 @@ App(
     fap_version="1.0",
     fap_description="BLE FindMy Location Beacon",
 )
+
+App(
+    appid="findmy_startup",
+    targets=["f7"],
+    apptype=FlipperAppType.STARTUP,
+    entry_point="findmy_startup",
+    sources=["findmy_startup.c", "findmy_state.c"],
+    order=1000,
+)
diff --git a/applications/system/findmy/findmy_startup.c b/applications/system/findmy/findmy_startup.c
new file mode 100644
index 000000000..c24eaa7ce
--- /dev/null
+++ b/applications/system/findmy/findmy_startup.c
@@ -0,0 +1,11 @@
+#include "findmy_state.h"
+#include <furi_hal.h>
+
+void findmy_startup() {
+    if(!furi_hal_is_normal_boot()) return;
+
+    FindMyState state;
+    if(findmy_state_load(&state)) {
+        findmy_state_apply(&state);
+    }
+}