diff --git a/src/client/camera.cpp b/src/client/camera.cpp
index 4abe062d7..f087956c2 100644
--- a/src/client/camera.cpp
+++ b/src/client/camera.cpp
@@ -473,12 +473,12 @@ void Camera::update(LocalPlayer* player, f32 frametime, f32 tool_reload_ratio)
 			m_fov_transition_active = false;
 			m_curr_fov_degrees = m_target_fov_degrees;
 		}
-	} else if (m_server_sent_fov) {
-		// Instantaneous FOV change
-		m_curr_fov_degrees = m_target_fov_degrees;
 	} else if (player->getPlayerControl().zoom && player->getZoomFOV() > 0.001f) {
 		// Player requests zoom, apply zoom FOV
 		m_curr_fov_degrees = player->getZoomFOV();
+	} else if (m_server_sent_fov) {
+		// Instantaneous FOV change
+		m_curr_fov_degrees = m_target_fov_degrees;
 	} else {
 		// Set to client's selected FOV
 		m_curr_fov_degrees = m_cache_fov;
diff --git a/src/client/game.cpp b/src/client/game.cpp
index 3098ca57c..af4b8cd17 100644
--- a/src/client/game.cpp
+++ b/src/client/game.cpp
@@ -2338,7 +2338,7 @@ void Game::toggleFullViewRange()
 void Game::checkZoomEnabled()
 {
 	LocalPlayer *player = client->getEnv().getLocalPlayer();
-	if (player->getZoomFOV() < 0.001f || player->getFov().fov > 0.0f)
+	if (player->getZoomFOV() < 0.001f)
 		m_game_ui->showTranslatedStatusText("Zoom currently disabled by game or mod");
 }