diff --git a/Minecraft.Client/Minecraft.cpp b/Minecraft.Client/Minecraft.cpp
index 5cb79f834..05196f17e 100644
--- a/Minecraft.Client/Minecraft.cpp
+++ b/Minecraft.Client/Minecraft.cpp
@@ -1981,6 +1981,8 @@ void Minecraft::run_middle() {
                                     // capture the save thumbnail
                                     app.CaptureSaveThumbnail();
                                     break;
+                                default:
+                                    break;
                             }
                         }
                     }
diff --git a/Minecraft.Client/Platform/Common/Consoles_App.cpp b/Minecraft.Client/Platform/Common/Consoles_App.cpp
index dc6d4e281..4bcf758e5 100644
--- a/Minecraft.Client/Platform/Common/Consoles_App.cpp
+++ b/Minecraft.Client/Platform/Common/Consoles_App.cpp
@@ -1330,6 +1330,8 @@ void CMinecraftApp::ActionGameSettings(int iPad,eGameSetting eVal)
 	case eGameSetting_PSVita_NetworkModeAdhoc:
 		//nothing to do here
 		break;
+	default:
+		break;
 	}
 }
 
@@ -3810,6 +3812,8 @@ void CMinecraftApp::HandleXuiActions(void)
 					SetAction(i,eAppAction_Idle);
 				}
 
+				break;
+			default:
 				break;
 			}
 		}
@@ -3994,6 +3998,8 @@ void CMinecraftApp::HandleXuiActions(void)
 				// 					app.NavigateToScene(ProfileManager.GetPrimaryPad(),eUIScene_MultiGameJoinLoad);
 				// 				}
 				break;
+			default:
+				break;
 			}
 		}
 
@@ -7512,6 +7518,8 @@ void CMinecraftApp::SetGameHostOption(unsigned int &uiHostSettings, eGameHostOpt
 	case eGameHostOption_All:
 		uiHostSettings=uiVal;
 		break;
+	default:
+		break;
 	}
 }
 
@@ -7585,7 +7593,9 @@ unsigned int CMinecraftApp::GetGameHostOption(unsigned int uiHostSettings, eGame
 		break;
 	case eGameHostOption_DisableSaving:
 		return (uiHostSettings&GAME_HOST_OPTION_BITMASK_DISABLESAVE);
-		break;		
+		break;
+	default:
+		return 0;
 	}
 
 	return false;
@@ -7918,6 +7928,8 @@ std::wstring CMinecraftApp::getEntityName(eINSTANCEOF type)
 		// 4J-PB - fix for #107167 - Customer Encountered: TU12: Content: UI: There is no information what killed Player after being slain by Iron Golem.
 	case eTYPE_VILLAGERGOLEM:
 		return app.GetString(IDS_IRONGOLEM);
+	default:
+		break;
 
 	};
 
diff --git a/Minecraft.Client/Platform/Common/UI/UIController.cpp b/Minecraft.Client/Platform/Common/UI/UIController.cpp
index 7fc5563ca..36a0616ed 100644
--- a/Minecraft.Client/Platform/Common/UI/UIController.cpp
+++ b/Minecraft.Client/Platform/Common/UI/UIController.cpp
@@ -1171,6 +1171,8 @@ void UIController::setupRenderPosition(C4JRender::eViewportType viewport)
 			xPos = (S32)(getScreenWidth() / 2);
 			yPos = (S32)(getScreenHeight() / 2);
 			break;
+		default:
+			break;
 		}
 		m_tileOriginX = xPos;
 		m_tileOriginY = yPos;
@@ -1433,6 +1435,8 @@ bool UIController::NavigateToScene(int iPad, EUIScene scene, void *initData, EUI
 			app.DebugPrintf("IGNORING NAVIGATE - we're trying to navigate to a user selected scene when there's already a scene up: pad:%d, scene:%d\n", iPad, scene);
 			return false;
 			break;
+		default:
+			break;
 		}
 	}
 
@@ -1458,6 +1462,8 @@ bool UIController::NavigateToScene(int iPad, EUIScene scene, void *initData, EUI
 			layer = eUILayer_Scene;
 		}
 		break;
+	default:
+		break;
 	};
 	int menuDisplayedPad = XUSER_INDEX_ANY;
 	if(group == eUIGroup_PAD)
diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_CreativeMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_CreativeMenu.cpp
index 36a08488d..7b47dd851 100644
--- a/Minecraft.Client/Platform/Common/UI/UIScene_CreativeMenu.cpp
+++ b/Minecraft.Client/Platform/Common/UI/UIScene_CreativeMenu.cpp
@@ -155,6 +155,8 @@ void UIScene_CreativeMenu::handleOtherClicked(int iPad, ESceneSection eSection,
 	case eSectionInventoryCreativeSlider:
 		ScrollBar(this->m_pointerPos);
 		break;
+	default:
+		break;
 	}
 }
 
@@ -490,4 +492,4 @@ void UIScene_CreativeMenu::updateScrollCurrentPage(int currentPage, int pageCoun
 	value[1].number = (F64)currentPage - 1;
 
 	IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ) , m_funcSetScrollBar , 2 , value );
-}
\ No newline at end of file
+}
diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_DebugCreateSchematic.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_DebugCreateSchematic.cpp
index 67436505f..671b247b5 100644
--- a/Minecraft.Client/Platform/Common/UI/UIScene_DebugCreateSchematic.cpp
+++ b/Minecraft.Client/Platform/Common/UI/UIScene_DebugCreateSchematic.cpp
@@ -208,6 +208,8 @@ int UIScene_DebugCreateSchematic::KeyboardCompleteCallback(void *lpParam,bool bR
 				pClass->m_data->endZ = iVal;
 			}
 			break;
+		default:
+			break;
 		}
 	}
 
diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_LeaderboardsMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_LeaderboardsMenu.cpp
index ea0d3f63c..3fd18c9eb 100644
--- a/Minecraft.Client/Platform/Common/UI/UIScene_LeaderboardsMenu.cpp
+++ b/Minecraft.Client/Platform/Common/UI/UIScene_LeaderboardsMenu.cpp
@@ -350,6 +350,8 @@ void UIScene_LeaderboardsMenu::handleInput(int iPad, int key, bool repeat, bool
 						m_labelFilter.setLabel(filterBuffer);
 					}
 					break;
+				default:
+					break;
 				}
 
 				ReadStats(-1);
@@ -484,6 +486,8 @@ void UIScene_LeaderboardsMenu::ReadStats(int startIndex)
 				);
 		}
 		break;
+	default:
+		break;
 	}
 
 	//Show the loading message
diff --git a/Minecraft.Client/Player/ServerPlayer.cpp b/Minecraft.Client/Player/ServerPlayer.cpp
index 9de4edcfc..b3ea69cac 100644
--- a/Minecraft.Client/Player/ServerPlayer.cpp
+++ b/Minecraft.Client/Player/ServerPlayer.cpp
@@ -703,6 +703,8 @@ bool ServerPlayer::hurt(DamageSource* dmgSource, int dmg) {
                                         m_lastDamageSource =
                                             eTelemetryPlayerDeathSource_Player_Arrow;
                                         break;
+                                    default:
+                                        break;
                                 }
                             }
                         }
@@ -710,6 +712,8 @@ bool ServerPlayer::hurt(DamageSource* dmgSource, int dmg) {
                     case eTYPE_FIREBALL:
                         m_lastDamageSource = eTelemetryPlayerDeathSource_Ghast;
                         break;
+                    default:
+                        break;
                 };
             }
         };