2 files changed, 9 insertions, 2 deletions

diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c
index a11a7f0c40..302a7428aa 100644
--- a/apps/menus/settings_menu.c
+++ b/apps/menus/settings_menu.c
@@ -123,8 +123,12 @@ MAKE_MENU(file_menu, ID2P(LANG_FILE), 0, Icon_file_view_menu,
 
 /* Battery */
 #ifndef SIMULATOR
+#if BATTERY_CAPACITY_INC > 0
 MENUITEM_SETTING(battery_capacity, &global_settings.battery_capacity, NULL);
+#endif
+#if BATTERY_TYPES_COUNT > 1
 MENUITEM_SETTING(battery_type, &global_settings.battery_type, NULL);
+#endif
 #ifdef HAVE_USB_POWER
 #if CONFIG_CHARGING
 static int usbcharging_callback(int action,const struct menu_item_ex *this_item)
@@ -142,7 +146,9 @@ MENUITEM_SETTING(usb_charging, &global_settings.usb_charging, usbcharging_callba
 #endif
 #endif
 MAKE_MENU(battery_menu, ID2P(LANG_BATTERY_MENU), 0, Icon_NOICON,
-          &battery_capacity,
+#if BATTERY_CAPACITY_INC > 0
+            &battery_capacity,
+#endif
 #if BATTERY_TYPES_COUNT > 1
             &battery_type,
 #endif
diff --git a/apps/settings_list.c b/apps/settings_list.c
index c1c0f6a634..ae32735733 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -483,12 +483,13 @@ const struct settings_list settings[] = {
 #endif
             "max files in dir", UNIT_INT,50,10000,50,NULL,NULL,NULL),
 #ifndef SIMULATOR
-
+#if BATTERY_CAPACITY_INC > 0
     INT_SETTING(0, battery_capacity, LANG_BATTERY_CAPACITY, BATTERY_CAPACITY_DEFAULT, 
                 "battery capacity", UNIT_MAH,
                 BATTERY_CAPACITY_MIN, BATTERY_CAPACITY_MAX, BATTERY_CAPACITY_INC,
                 NULL, NULL, NULL),
 #endif
+#endif
 #if CONFIG_CHARGING
     OFFON_SETTING(NVRAM(1), car_adapter_mode,
         LANG_CAR_ADAPTER_MODE, false, "car adapter mode", NULL),