diff --git a/applications/main/application.fam b/applications/main/application.fam
index 6f1be721b..6514692f7 100644
--- a/applications/main/application.fam
+++ b/applications/main/application.fam
@@ -25,6 +25,7 @@ App(
         "ibutton_start",
         "onewire_start",
         "subghz_start",
+        "subghz_load_extended_settings",
         "infrared_start",
         "lfrfid_start",
         "nfc_start",
diff --git a/applications/main/subghz/application.fam b/applications/main/subghz/application.fam
index d57ba2aff..c2796ef26 100644
--- a/applications/main/subghz/application.fam
+++ b/applications/main/subghz/application.fam
@@ -3,25 +3,17 @@ App(
     name="SubGHz",
     apptype=FlipperAppType.APP,
     targets=["f7"],
-    cdefines=["APP_SUBGHZ"],
     entry_point="subghz_app",
-    requires=[
-        "gui",
-        "cli",
-        "dialogs",
-    ],
-    provides=[
-        "subghz_start",
-        "subghz_load_extended_settings",
-    ],
     icon="A_Sub1ghz_14",
     stack_size=3 * 1024,
     order=10,
-    sources=[
-        "*.c",
-        "!subghz_cli.c",
-        "!helpers/subghz_chat.c",
-    ],
+    # Sources separation breaks linking with subghz on internal, commented for now
+    # sources=[
+    #     "*.c",
+    #     "!subghz_cli.c",
+    #     "!helpers/subghz_chat.c",
+    #     "!subghz_extended_freq.c",
+    # ],
     resources="resources",
     fap_libs=["hwdrivers"],
     fap_icon="icon.png",
@@ -33,15 +25,15 @@ App(
     targets=["f7"],
     apptype=FlipperAppType.STARTUP,
     entry_point="subghz_on_system_start",
-    sources=["subghz_cli.c", "helpers/subghz_chat.c"],
-    requires=["subghz"],
+    # sources=["subghz_cli.c", "helpers/subghz_chat.c"],
     order=40,
 )
 
 App(
     appid="subghz_load_extended_settings",
+    targets=["f7"],
     apptype=FlipperAppType.STARTUP,
     entry_point="subghz_extended_freq",
-    requires=["storage", "subghz"],
+    # sources=["subghz_extended_freq.c"],
     order=650,
 )