diff --git a/EXILED/Exiled.Events/Patches/Events/Player/SearchingPickupEvent.cs b/EXILED/Exiled.Events/Patches/Events/Player/SearchingPickupEvent.cs
index 5f074567f..c05e73f0c 100644
--- a/EXILED/Exiled.Events/Patches/Events/Player/SearchingPickupEvent.cs
+++ b/EXILED/Exiled.Events/Patches/Events/Player/SearchingPickupEvent.cs
@@ -35,6 +35,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
             List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
 
             Label retLabel = generator.DefineLabel();
+            Label skipLabel = generator.DefineLabel();
 
             LocalBuilder ev = generator.DeclareLocal(typeof(SearchingPickupEventArgs));
 
@@ -46,12 +47,22 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
             offset = 1;
             index = newInstructions.FindIndex(instruction => instruction.opcode == OpCodes.Ret) + offset;
 
+            List<Label> logicLabels = newInstructions[index].ExtractLabels();
+            newInstructions[index].labels.Add(skipLabel);
+
             newInstructions.InsertRange(
                 index,
                 new[]
                 {
+                    // if (request.Target is not ItemPickupBase)
+                    //    skip
+                    new CodeInstruction(OpCodes.Ldloca_S, 0).WithLabels(logicLabels),
+                    new(OpCodes.Callvirt, PropertyGetter(typeof(SearchRequest), nameof(SearchRequest.Target))),
+                    new(OpCodes.Isinst, typeof(ItemPickupBase)),
+                    new(OpCodes.Brfalse_S, skipLabel),
+
                     // Player.Get(Hub)
-                    new CodeInstruction(OpCodes.Ldarg_0).MoveLabelsFrom(newInstructions[index]),
+                    new(OpCodes.Ldarg_0),
                     new(OpCodes.Callvirt, PropertyGetter(typeof(SearchCoordinator), nameof(SearchCoordinator.Hub))),
                     new(OpCodes.Call, Method(typeof(Player), nameof(Player.Get), new[] { typeof(ReferenceHub) })),
 
@@ -115,9 +126,10 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                 index,
                 new[]
                 {
-                    // num3 = ev.SearchTime
+                    // num3 = SafeGetTime(ev, this);
                     new CodeInstruction(OpCodes.Ldloc_S, ev.LocalIndex),
-                    new(OpCodes.Callvirt, PropertyGetter(typeof(SearchingPickupEventArgs), nameof(SearchingPickupEventArgs.SearchTime))),
+                    new(OpCodes.Ldarg_0),
+                    new(OpCodes.Call, Method(typeof(SearchingPickupEvent), nameof(SafeGetTime))),
                 });
 
             for (int z = 0; z < newInstructions.Count; z++)
@@ -125,5 +137,13 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
 
             ListPool<CodeInstruction>.Pool.Return(newInstructions);
         }
+
+        private static float SafeGetTime(SearchingPickupEventArgs ev, SearchCoordinator coordinator)
+        {
+            if (ev != null)
+                return ev.SearchTime;
+
+            return coordinator.SessionPipe.Request.Target.SearchTimeForPlayer(coordinator.Hub);
+        }
     }
 }