diff --git a/CHANGELOG.md b/CHANGELOG.md
index 418e9aea3b..2df9c850c5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Server kicks old client when a user is trying to log in again (often the case when a user's original connection gets dropped)
+- Added a raycast check to beams to prevent their effect applying through walls
 
 ## [0.9.0] - 2021-03-20
 
diff --git a/common/sys/src/beam.rs b/common/sys/src/beam.rs
index 65c86c8c45..b1bdc0d504 100644
--- a/common/sys/src/beam.rs
+++ b/common/sys/src/beam.rs
@@ -6,14 +6,16 @@ use common::{
     },
     event::{EventBus, ServerEvent},
     resources::{DeltaTime, Time},
+    terrain::TerrainGrid,
     uid::{Uid, UidAllocator},
+    vol::ReadVol,
     GroupTarget,
 };
 use common_ecs::{Job, Origin, ParMode, Phase, System};
 use rayon::iter::ParallelIterator;
 use specs::{
-    saveload::MarkerAllocator, shred::ResourceId, Entities, Join, ParJoin, Read, ReadStorage,
-    SystemData, World, WriteStorage,
+    saveload::MarkerAllocator, shred::ResourceId, Entities, Join, ParJoin, Read, ReadExpect,
+    ReadStorage, SystemData, World, WriteStorage,
 };
 use std::time::Duration;
 use vek::*;
@@ -24,6 +26,7 @@ pub struct ReadData<'a> {
     server_bus: Read<'a, EventBus<ServerEvent>>,
     time: Read<'a, Time>,
     dt: Read<'a, DeltaTime>,
+    terrain: ReadExpect<'a, TerrainGrid>,
     uid_allocator: Read<'a, UidAllocator>,
     uids: ReadStorage<'a, Uid>,
     positions: ReadStorage<'a, Pos>,
@@ -138,6 +141,14 @@ impl<'a> System<'a> for Sys {
                     // Collision shapes
                     && sphere_wedge_cylinder_collision(pos.0, frame_start_dist, frame_end_dist, *ori.look_dir(), beam_segment.angle, pos_b.0, rad_b, height_b);
 
+                // Finally, ensure that a hit has actually occurred by performing a raycast. We do this last because
+                // it's likely to be the most expensive operation.
+                let tgt_dist = pos.0.distance(pos_b.0);
+                let hit = hit && read_data.terrain
+                    .ray(pos.0, pos.0 + *ori.look_dir() * (tgt_dist + 1.0))
+                    .until(|b| b.is_filled())
+                    .cast().0 >= tgt_dist;
+
                 if hit {
                     // See if entities are in the same group
                     let same_group = group