diff --git a/src/hacks/Warp.cpp b/src/hacks/Warp.cpp
index bf47923a..4c8c6346 100644
--- a/src/hacks/Warp.cpp
+++ b/src/hacks/Warp.cpp
@@ -268,6 +268,8 @@ void Warp(float accumulated_extra_samples, bool finalTick)
         return;
     }
 
+    PROF_SECTION(warp_profiler);
+
     int warp_ticks = warp_amount;
     if (warp_amount_override)
         warp_ticks = warp_amount_override;
diff --git a/src/hooks/CreateMove.cpp b/src/hooks/CreateMove.cpp
index 30c4ffc4..d9336441 100644
--- a/src/hooks/CreateMove.cpp
+++ b/src/hooks/CreateMove.cpp
@@ -233,6 +233,8 @@ DEFINE_HOOKED_METHOD(CreateMove, bool, void *this_, float input_sample_time, CUs
     }
 
     //	PROF_BEGIN();
+    // Do not update if in warp, since the entities will stay identical either way
+    if (!hacks::tf2::warp::in_warp)
     {
         PROF_SECTION(EntityCache);
         entity_cache::Update();