diff --git a/firmware/export/config/archosrecorder.h b/firmware/export/config/archosrecorder.h
index ef9f523c49..505a039afe 100644
--- a/firmware/export/config/archosrecorder.h
+++ b/firmware/export/config/archosrecorder.h
@@ -80,7 +80,11 @@
 #define BATTERY_CAPACITY_INC 50   /* capacity increment */
 #define BATTERY_TYPES_COUNT  1    /* only one type */
 
-#define CURRENT_NORMAL    145  /* usual current in mA */
+if MEM < 8
+ #define CURRENT_NORMAL    145  /* usual current in mA */
+#else
+ #define CURRENT_NORMAL    145 *100 / 122 /* assuming 192 kbps, the running time is 22% longer with 8MB */
+#endif
 #define CURRENT_RECORD     35  /* additional recording current */
 #define CURRENT_USB       500 /* usual current in mA in USB mode */
 
diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c
index 74564bd1a2..f8c3995e1a 100644
--- a/firmware/powermgmt.c
+++ b/firmware/powermgmt.c
@@ -371,12 +371,7 @@ static int runcurrent(void)
 {
     int current;
 
-#if MEM == 8 && !(defined(ARCHOS_ONDIOSP) || defined(ARCHOS_ONDIOFM))
-    /* assuming 192 kbps, the running time is 22% longer with 8MB */
-    current = CURRENT_NORMAL*100 / 122;
-#else
     current = CURRENT_NORMAL;
-#endif /* MEM == 8 */
 
 #ifndef BOOTLOADER
     if (usb_inserted()