diff --git a/applications/plugins/arkanoid/arkanoid_game.c b/applications/plugins/arkanoid/arkanoid_game.c
index 91ae8e736..d0026e226 100644
--- a/applications/plugins/arkanoid/arkanoid_game.c
+++ b/applications/plugins/arkanoid/arkanoid_game.c
@@ -448,14 +448,13 @@ int32_t arkanoid_game_app(void* p) {
                             arkanoid_state->ball_state.dy = -1;
                             //start the game flag
                             arkanoid_state->gameStarted = true;
-                            break;
                         }
+                        break;
+                    default:
+                        break;
                     }
                 }
             }
-        } else {
-            // Event timeout
-            FURI_LOG_D(TAG, "furi_message_queue: Event timeout");
         }
 
         view_port_update(view_port);
diff --git a/applications/plugins/barcode_generator/barcode_generator.c b/applications/plugins/barcode_generator/barcode_generator.c
index d03d45495..0418d672c 100644
--- a/applications/plugins/barcode_generator/barcode_generator.c
+++ b/applications/plugins/barcode_generator/barcode_generator.c
@@ -523,12 +523,11 @@ int32_t barcode_UPCA_generator_app(void* p) {
                             plugin_state->modeIndex = 0;
                         }
                         break;
+                    default:
+                        break;
                     }
                 }
             }
-        } else {
-            FURI_LOG_D("barcode_UPCA_generator", "osMessageQueue: event timeout");
-            // event timeout
         }
 
         view_port_update(view_port);
diff --git a/applications/plugins/flappy_bird/flappy_bird.c b/applications/plugins/flappy_bird/flappy_bird.c
index 9895c2c31..37b8fdebe 100644
--- a/applications/plugins/flappy_bird/flappy_bird.c
+++ b/applications/plugins/flappy_bird/flappy_bird.c
@@ -345,14 +345,13 @@ int32_t flappy_game_app(void* p) {
                     case InputKeyBack:
                         processing = false;
                         break;
+                    default:
+                        break;
                     }
                 }
             } else if(event.type == EventTypeTick) {
                 flappy_game_tick(game_state);
             }
-        } else {
-            //FURI_LOG_D(TAG, "osMessageQueue: event timeout");
-            // event timeout
         }
 
         view_port_update(view_port);
diff --git a/applications/plugins/gps_nmea_uart/gps.c b/applications/plugins/gps_nmea_uart/gps.c
index 1df4882b5..62053cede 100644
--- a/applications/plugins/gps_nmea_uart/gps.c
+++ b/applications/plugins/gps_nmea_uart/gps.c
@@ -110,11 +110,11 @@ int32_t gps_app(void* p) {
                     case InputKeyBack:
                         processing = false;
                         break;
+                    default:
+                        break;
                     }
                 }
             }
-        } else {
-            FURI_LOG_D("GPS", "FuriMessageQueue: event timeout");
         }
 
         view_port_update(view_port);
diff --git a/applications/plugins/minesweeper/minesweeper.c b/applications/plugins/minesweeper/minesweeper.c
index 95044c04c..fa9fdcc78 100644
--- a/applications/plugins/minesweeper/minesweeper.c
+++ b/applications/plugins/minesweeper/minesweeper.c
@@ -476,6 +476,8 @@ int32_t minesweeper_app(void* p) {
                         // Exit the plugin
                         processing = false;
                         break;
+                    default:
+                        break;
                     }
                 } else if(event.input.type == InputTypeLong) {
                     // hold events
@@ -493,6 +495,8 @@ int32_t minesweeper_app(void* p) {
                     case InputKeyBack:
                         processing = false;
                         break;
+                    default:
+                        break;
                     }
                 }
             }
diff --git a/applications/plugins/mousejacker/mousejacker.c b/applications/plugins/mousejacker/mousejacker.c
index 79067bce3..3b1b2e6f7 100644
--- a/applications/plugins/mousejacker/mousejacker.c
+++ b/applications/plugins/mousejacker/mousejacker.c
@@ -372,6 +372,8 @@ int32_t mousejacker_app(void* p) {
                         plugin_state->close_thread_please = false;
                         processing = false;
                         break;
+                    default:
+                        break;
                     }
                 }
             }
diff --git a/applications/plugins/nrfsniff/nrfsniff.c b/applications/plugins/nrfsniff/nrfsniff.c
index 315db831c..094775426 100644
--- a/applications/plugins/nrfsniff/nrfsniff.c
+++ b/applications/plugins/nrfsniff/nrfsniff.c
@@ -399,6 +399,8 @@ int32_t nrfsniff_app(void* p) {
                     case InputKeyBack:
                         if(event.input.type == InputTypeLong) processing = false;
                         break;
+                    default:
+                        break;
                     }
                 }
             }
diff --git a/applications/plugins/sentry_safe/sentry_safe.c b/applications/plugins/sentry_safe/sentry_safe.c
index f88661beb..4d9c12fc7 100644
--- a/applications/plugins/sentry_safe/sentry_safe.c
+++ b/applications/plugins/sentry_safe/sentry_safe.c
@@ -143,6 +143,8 @@ int32_t sentry_safe_app(void* p) {
                     case InputKeyBack:
                         processing = false;
                         break;
+                    default:
+                        break;
                     }
                 }
             }
diff --git a/applications/plugins/tictactoe_game/tictactoe_game.c b/applications/plugins/tictactoe_game/tictactoe_game.c
index b3a0d5c84..fe57d7c62 100644
--- a/applications/plugins/tictactoe_game/tictactoe_game.c
+++ b/applications/plugins/tictactoe_game/tictactoe_game.c
@@ -358,12 +358,11 @@ int32_t tictactoe_game_app(void* p) {
                     case InputKeyOk:
                         tictactoe_state->button_state = true;
                         break;
+                    default:
+                        break;
                     }
                 }
             }
-        } else {
-            // Event timeout
-            FURI_LOG_D(TAG, "furi_message_queue: Event timeout");
         }
 
         view_port_update(view_port);