diff --git a/code/controllers/subsystems/hallucinations.dm b/code/controllers/subsystems/hallucinations.dm
index 220d5b24549..659c241ce1c 100644
--- a/code/controllers/subsystems/hallucinations.dm
+++ b/code/controllers/subsystems/hallucinations.dm
@@ -263,6 +263,9 @@ SUBSYSTEM_DEF(hallucinations)
 		adpi_next_message -= target
 		return
 
+	if(world.time < adpi_next_message[target])
+		return
+
 	if(is_adpi_blocked(target))
 		// ping their blocker an schedule another ping later.
 		schedule_next_adpi_message(target)
@@ -272,9 +275,6 @@ SUBSYSTEM_DEF(hallucinations)
 		schedule_next_adpi_message(target, TRUE)
 		return
 
-	if(world.time < adpi_next_message[target])
-		return
-
 	if(send_adpi_message(target))
 		schedule_next_adpi_message(target)
 	else
diff --git a/html/changelogs/hellfirejag-adpi 3.yml b/html/changelogs/hellfirejag-adpi 3.yml
new file mode 100644
index 00000000000..f60351abf62
--- /dev/null
+++ b/html/changelogs/hellfirejag-adpi 3.yml	
@@ -0,0 +1,4 @@
+author: Hellfirejag
+delete-after: True
+changes:
+  - bugfix: "Fixed ADPI pinging mindshields more than once per message interval."