diff --git a/include/arch/msp430fr5994lp/driver/counter.h b/include/arch/msp430fr5994lp/driver/counter.h
index 1d7800aaba26d41d77152fe8cf45b7225b73e158..429de3989c1deeba346c2f3595f4b73f10f2c499 100644
--- a/include/arch/msp430fr5994lp/driver/counter.h
+++ b/include/arch/msp430fr5994lp/driver/counter.h
@@ -5,7 +5,7 @@
 #include <stdint.h>
 
 typedef uint16_t counter_value_t;
-typedef uint8_t counter_overflow_t;
+typedef uint16_t counter_overflow_t;
 
 class Counter {
 	private:
@@ -13,7 +13,7 @@ class Counter {
 
 	public:
 		uint16_t value;
-		volatile uint8_t overflow;
+		volatile uint16_t overflow;
 
 		Counter() : overflow(0) {}
 
diff --git a/src/arch/msp430fr5994lp/driver/counter.cc b/src/arch/msp430fr5994lp/driver/counter.cc
index daa7a2def61a595d3c33187ab5c7a9e1ff630d8a..d69d844728e8fe4904fd106d6205e48dd8799e0f 100644
--- a/src/arch/msp430fr5994lp/driver/counter.cc
+++ b/src/arch/msp430fr5994lp/driver/counter.cc
@@ -6,7 +6,7 @@ Counter counter;
 __attribute__((interrupt(TIMER2_A1_VECTOR))) void handle_timer2_overflow()
 {
 	if (TA2IV == 0x0e) {
-		if (counter.overflow < 255) {
+		if (counter.overflow < 65535) {
 			counter.overflow++;
 		}
 	}