diff --git a/Controller.cpp b/Controller.cpp
index eb7ac08..6966a41 100644
--- a/Controller.cpp
+++ b/Controller.cpp
@@ -142,9 +142,6 @@ void CController::IncrementDStarVocoder()
 
 void CController::ReadReflector()
 {
-	// local audio storage
-	static int16_t audio[160];
-
 	while (keep_running) {
 		STCPacket tcpack;
 		//wait up to 40 ms to read something on the unix port
@@ -179,7 +176,7 @@ void CController::ReadReflector()
 				if (packet->IsSecond()) {
 					if (packet->GetCodecIn() == ECodecType::c2_1600) {
 						//copy the audio from local storage
-						memcpy(packet->GetAudio(), audio, 320);
+						memcpy(packet->GetAudio(), audio_store[packet->GetModule()], 320);
 					} else /* codec_in is ECodecType::c2_3200 */ {
 						//decode the second 8 data bytes
 						//move the 160 audio samples to the packet
@@ -193,8 +190,8 @@ void CController::ReadReflector()
 						//decode it
 						c2_16.codec2_decode(tmp, packet->GetM17Data()); // 8 bytes input produces 320 audio points
 						//move the first and second half
-						memcpy(packet->GetAudio(), tmp, 160*sizeof(int16_t));
-						memcpy(audio, tmp+160, 160*sizeof(int16_t));
+						memcpy(packet->GetAudio(), tmp, 320);
+						memcpy(audio_store[packet->GetModule()], tmp+160, 320);
 					} else /* codec_in is ECodecType::c2_3200 */ {
 						c2_32.codec2_decode(packet->GetAudio(), packet->GetM17Data());
 					}
diff --git a/Controller.h b/Controller.h
index 2e80848..827c7b6 100644
--- a/Controller.h
+++ b/Controller.h
@@ -17,6 +17,7 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 #include <vector>
+#include <map>
 #include <set>
 #include <memory>
 #include <atomic>
@@ -42,6 +43,7 @@ protected:
 	std::atomic<bool> keep_running;
 	std::future<void> reflectorThread, ambeThread;
 	std::vector<std::shared_ptr<CDV3003>> dmr_device, dstar_device;
+	std::map<char, int16_t[160]> audio_store;
 	CUnixDgramReader reader;
 	CUnixDgramWriter writer;
 	CCodec2 c2_16{false};