diff --git a/keyboard/tentapad/matrix.c b/keyboard/tentapad/matrix.c
index 7c9f9c7f..3f58aa69 100644
--- a/keyboard/tentapad/matrix.c
+++ b/keyboard/tentapad/matrix.c
@@ -36,12 +36,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef DEBOUNCE
 #   define DEBOUNCE	5
 #endif
-static uint8_t debouncing = DEBOUNCE;
-static uint16_t debouncing_last[MATRIX_COLS];
 
 /* matrix state(1:on, 0:off) */
-static matrix_row_t matrix;
-static matrix_row_t matrix_debouncing;
+static matrix_row_t matrix = 0;
+static matrix_row_t debouncing = 0;
+static uint16_t debouncing_last[MATRIX_COLS];
 
 static matrix_row_t read_cols(void);
 static void init_cols(void);
@@ -86,10 +85,6 @@ void matrix_init(void)
 
     // initialize cols
     init_cols();
-
-    // initialize matrix state: all keys off
-    matrix = 0;
-    matrix_debouncing = 0;
 }
 
 uint8_t matrix_scan(void)