diff --git a/goal_src/jak2/engine/draw/drawable.gc b/goal_src/jak2/engine/draw/drawable.gc
index 18a4dc2d27..b10f9af303 100644
--- a/goal_src/jak2/engine/draw/drawable.gc
+++ b/goal_src/jak2/engine/draw/drawable.gc
@@ -1202,8 +1202,14 @@
                     (set! (-> pp clock) (-> sv-16 clock))
 
                     ;; draw!
-                    (if (or (= lod-idx (-> dc cur-lod)) (logtest? (-> dc status) (draw-control-status lod-set)))
-                        (foreground-draw dc dma-buf dist-w)
+                    ;; PC port note : we ALWAYS disable the envmap hack when a process-drawable has warp effect enabled
+                    (when (or (= lod-idx (-> dc cur-lod)) (logtest? (-> dc status) (draw-control-status lod-set)))
+                        (protect ((-> *pc-settings* force-envmap?))
+                          (dotimes (eff-i (-> dc mgeo header effect-count))
+                            (if (logtest? (effect-bits cross-fade) (-> dc mgeo effect eff-i effect-bits))
+                              (false! (-> *pc-settings* force-envmap?))))
+                          (foreground-draw dc dma-buf dist-w)
+                          )
                         )
                     )