diff --git a/src/p_spec.c b/src/p_spec.c
index 2d5707d37..f26176c33 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -9614,6 +9614,11 @@ void P_DoQuakeOffset(UINT8 view, mappoint_t *viewPos, mappoint_t *offset)
 
 	fixed_t maxShake = FixedMul(cv_cam_height[view].value, mapobjectscale) * 3 / 4;
 
+	if (mapheaderinfo[gamemap-1]->cameraHeight >= 0)
+	{
+		maxShake = FixedMul(mapheaderinfo[gamemap-1]->cameraHeight, mapobjectscale) * 3 / 4;
+	}
+
 	if (battle)
 	{
 		addZ /= 2;