diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d0ac574d..b0697efd9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Changed
 - updated many translations 
+- disable skipping to next break from tray when in strict mode
 
 ### Fixed
 - transparency issues on Windows 10
diff --git a/app/main.js b/app/main.js
index 9fe40cac2..c61aec803 100644
--- a/app/main.js
+++ b/app/main.js
@@ -1253,7 +1253,11 @@ function getTrayMenuTemplate () {
     })
   }
 
-  if (!(breakPlanner.isPaused || breakPlanner.dndManager.isOnDnd || breakPlanner.appExclusionsManager.isSchedulerCleared)) {
+  if (breakPlanner.scheduler.reference === 'finishMicrobreak' && settings.get('microbreakStrictMode')) {
+    // nothing
+  } else if (breakPlanner.scheduler.reference === 'finishBreak' && settings.get('breakStrictMode')) {
+    // nothing
+  } else if (!(breakPlanner.isPaused || breakPlanner.dndManager.isOnDnd || breakPlanner.appExclusionsManager.isSchedulerCleared)) {
     let submenu = []
     if (settings.get('microbreak')) {
       submenu = submenu.concat([{