diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 39bdcf40..bb209d9d 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -31,7 +31,6 @@ int CmdHF14AList(const char *Cmd)
 {
 	bool ShowWaitCycles = false;
 	char param = param_getchar(Cmd, 0);
-	
 	if (param == 'h' || (param != 0 && param != 'f')) {
 		PrintAndLog("List data in trace buffer.");
 		PrintAndLog("Usage:  hf 14a list [f]");
@@ -44,7 +43,8 @@ int CmdHF14AList(const char *Cmd)
 		ShowWaitCycles = true;
 	}
 		
-	uint8_t got[1920];
+	//uint8_t got[1920];
+	uint8_t got[TRACE_BUFFER_SIZE]; //changed to retrieve actual trace buffer size in apps.h in armsrc
 	GetFromBigBuf(got,sizeof(got),0);
 	WaitForResponse(CMD_ACK,NULL);
 
@@ -62,7 +62,7 @@ int CmdHF14AList(const char *Cmd)
 	uint32_t EndOfTransmissionTimestamp = 0;
 	
 	for (;;) {
-		if(i >= 1900) {
+		if(i >= TRACE_BUFFER_SIZE) {
 			break;
 		}
 
@@ -86,7 +86,7 @@ int CmdHF14AList(const char *Cmd)
 		if (len > 100) {
 			break;
 		}
-		if (i + len >= 1900) {
+		if (i + len >= TRACE_BUFFER_SIZE) {
 			break;
 		}
 
diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c
index c42d54c5..aebc0734 100644
--- a/client/cmdhf14b.c
+++ b/client/cmdhf14b.c
@@ -145,7 +145,7 @@ demodError:
 
 int CmdHF14BList(const char *Cmd)
 {
-  uint8_t got[960];
+  uint8_t got[TRACE_BUFFER_SIZE];
   GetFromBigBuf(got,sizeof(got),0);
   WaitForResponse(CMD_ACK,NULL);
 
@@ -157,7 +157,8 @@ int CmdHF14BList(const char *Cmd)
   int prev = -1;
 
   for(;;) {
-    if(i >= 900) {
+    //if(i >= 900) {
+    if(i >= TRACE_BUFFER_SIZE) {
       break;
     }
 
@@ -176,7 +177,8 @@ int CmdHF14BList(const char *Cmd)
     if(len > 100) {
       break;
     }
-    if(i + len >= 900) {
+    //if(i + len >= 900) {
+    if(i + len >= TRACE_BUFFER_SIZE) {
       break;
     }
 
diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index d9af9044..f9e3bb40 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -56,7 +56,8 @@ int CmdHFiClassList(const char *Cmd)
 		return 0;
 	}
 
-	uint8_t got[1920];
+	//uint8_t got[1920];
+	uint8_t got[TRACE_BUFFER_SIZE];
 	GetFromBigBuf(got,sizeof(got),0);
 	WaitForResponse(CMD_ACK,NULL);
 
@@ -78,7 +79,7 @@ int CmdHFiClassList(const char *Cmd)
 	uint32_t EndOfTransmissionTimestamp = 0;
 
 
-	for( i=0; i < 1900;)
+	for( i=0; i < TRACE_BUFFER_SIZE;)
 	{
 		//First 32 bits contain
 		// isResponse (1 bit)
diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index 32d38aeb..26f8cac6 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -30,7 +30,7 @@ size_t nbytes(size_t nbits) {
 
 int CmdLFHitagList(const char *Cmd)
 {
-  uint8_t got[3000];
+  uint8_t got[TRACE_BUFFER_SIZE];
   GetFromBigBuf(got,sizeof(got),0);
   WaitForResponse(CMD_ACK,NULL);
 
@@ -42,7 +42,8 @@ int CmdLFHitagList(const char *Cmd)
   int prev = -1;
 
   for (;;) {
-    if(i >= 1900) {
+    //if(i >= 1900) {
+    if(i >= TRACE_BUFFER_SIZE) {
       break;
     }
 
@@ -69,7 +70,8 @@ int CmdLFHitagList(const char *Cmd)
     if (len > 100) {
       break;
     }
-    if (i + len >= 1900) {
+    //if (i + len >= 1900) {
+    if (i + len >= TRACE_BUFFER_SIZE) {
       break;
     }
 
diff --git a/client/data.h b/client/data.h
index 33ee9d04..70d4ad66 100644
--- a/client/data.h
+++ b/client/data.h
@@ -12,9 +12,9 @@
 #define DATA_H__
 
 #include <stdint.h>
-
+//trace buffer size as defined in armsrc/apps.h TRACE_SIZE
+#define TRACE_BUFFER_SIZE 3000
 #define SAMPLE_BUFFER_SIZE 64
-
 extern uint8_t* sample_buf;
 extern size_t sample_buf_len;
 #define arraylen(x) (sizeof(x)/sizeof((x)[0]))