diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1b8350a04b..ae4584a4cd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -543,6 +543,10 @@ if (BUILD_OPENCS)
     add_subdirectory (extern/osgQt)
 endif()
 
+if (CMAKE_CXX_COMPILER_ID STREQUAL GNU OR CMAKE_CXX_COMPILER_ID STREQUAL Clang)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=implicit-fallthrough")
+endif()
+
 # Components
 add_subdirectory (components)
 
diff --git a/apps/opencs/model/world/refidadapterimp.hpp b/apps/opencs/model/world/refidadapterimp.hpp
index 84fec5bed0..c35d3c5a7c 100644
--- a/apps/opencs/model/world/refidadapterimp.hpp
+++ b/apps/opencs/model/world/refidadapterimp.hpp
@@ -1870,6 +1870,7 @@ namespace CSMWorld
                         content.mWander.mDuration = static_cast<short>(value.toInt());
                     else
                         return; // return without saving
+                    break;
                 case 3:
                     if (content.mType == ESM::AI_Wander)
                         content.mWander.mTimeOfDay = static_cast<unsigned char>(value.toInt());
diff --git a/apps/openmw/mwmechanics/spelleffects.cpp b/apps/openmw/mwmechanics/spelleffects.cpp
index 24816b9ed1..fa2733d837 100644
--- a/apps/openmw/mwmechanics/spelleffects.cpp
+++ b/apps/openmw/mwmechanics/spelleffects.cpp
@@ -453,6 +453,7 @@ void applyMagicEffect(const MWWorld::Ptr& target, const MWWorld::Ptr& caster, co
             }
             addBoundItem(world->getStore().get<ESM::GameSetting>().find("sMagicBoundRightGauntletID")->mValue.getString(), target);
             // left gauntlet added below
+            [[fallthrough]];
         case ESM::MagicEffect::BoundDagger:
         case ESM::MagicEffect::BoundLongsword:
         case ESM::MagicEffect::BoundMace:
@@ -920,6 +921,7 @@ void removeMagicEffect(const MWWorld::Ptr& target, ActiveSpells::ActiveSpellPara
             break;
         case ESM::MagicEffect::BoundGloves:
             removeBoundItem(world->getStore().get<ESM::GameSetting>().find("sMagicBoundRightGauntletID")->mValue.getString(), target);
+            [[fallthrough]];
         case ESM::MagicEffect::BoundDagger:
         case ESM::MagicEffect::BoundLongsword:
         case ESM::MagicEffect::BoundMace: