diff --git a/changelog.md b/changelog.md
index 68949901e4..ab3cbdf9ae 100644
--- a/changelog.md
+++ b/changelog.md
@@ -24,4 +24,5 @@
 05-16-2019 - Add RGB Light Effect Range functionality   
 05-26-2019 - Update templates to use proper debounce define  
 05-26-2019 - Add Solus support for Linux install script  
-05-29-2019 - Fix TO() and DF() calling layer_state_set_[kb,user] twice (qmk#6003)   
\ No newline at end of file
+05-29-2019 - Fix TO() and DF() calling layer_state_set_[kb,user] twice (qmk#6003)   
+05-29-2019 - Fixing matrix_scan so it properly returns changed status  
\ No newline at end of file
diff --git a/quantum/matrix.c b/quantum/matrix.c
index ca63f50f24..e222a30976 100644
--- a/quantum/matrix.c
+++ b/quantum/matrix.c
@@ -326,5 +326,5 @@ uint8_t matrix_scan(void)
   debounce(raw_matrix, matrix, MATRIX_ROWS, changed);
 
   matrix_scan_quantum();
-  return 1;
+  return (uint8_t)changed;
 }