diff --git a/apps/codecs.h b/apps/codecs.h
index 4cf1f81ed1..e322d758e1 100644
--- a/apps/codecs.h
+++ b/apps/codecs.h
@@ -72,7 +72,8 @@
 
 #endif
 
-/* This size must match the one set in ../plugins/plugin.lds */
+/* This size must match the one set in ../plugins/plugin.lds and
+   ../../firmware/app.lds */
 #define CODEC_BUFFER_SIZE 0x40000
 
 #ifdef SIMULATOR
diff --git a/apps/plugin.h b/apps/plugin.h
index 6bd4ed7fe2..68916b8001 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -86,7 +86,6 @@
 #else
 #define PLUGIN_BUFFER_SIZE 0x8000
 #endif
-#define CODEC_BUFFER_SIZE 0x3C000
 
 #ifdef SIMULATOR
 #define PREFIX(_x_) sim_ ## _x_
diff --git a/firmware/app.lds b/firmware/app.lds
index 06df52de96..91f03955cc 100644
--- a/firmware/app.lds
+++ b/firmware/app.lds
@@ -108,7 +108,7 @@ _pluginbuf = 0;
 #endif
 
 #if CONFIG_HWCODEC == MASNONE
-#define CODECSIZE 0x3C000
+#define CODECSIZE 0x40000
 #else
 #define CODECSIZE 0
 #endif