diff --git a/src/main.c b/src/main.c
index cda27ba..0ec5b53 100644
--- a/src/main.c
+++ b/src/main.c
@@ -220,10 +220,14 @@ void layer_disable(layer l) {
   for (u8 row=0; row<KB_ROWS; row++) {
     for (u8 col=0; col<KB_COLUMNS; col++) {
       if (layers_pressed[row][col] == l) {
+        // FIXME this kinda shouldn't be here and it privileges layer 0 even more
         layers_pressed[row][col] = 0;
         exec_key(l, row, col, false);
-        layers_pressed[row][col] = layers_top;
-        exec_key(layers_top, row, col, true);
+
+        if (! layer_sticky[l]) { // don't resend for sticky keys
+          layers_pressed[row][col] = layers_top;
+          exec_key(layers_top, row, col, true);
+        }
       }
     }
   }