diff --git a/code/modules/mob/living/bot/secbot.dm b/code/modules/mob/living/bot/secbot.dm
index e8d1654f62a..594a83223a2 100644
--- a/code/modules/mob/living/bot/secbot.dm
+++ b/code/modules/mob/living/bot/secbot.dm
@@ -595,7 +595,7 @@
 
 /mob/living/bot/secbot/attackby(var/obj/item/O, var/mob/user)
 	..()
-	if(istype(O, /obj/item/weapon/card/id))
+	if(istype(O, /obj/item/weapon/card/id) || istype(O, /obj/item/weapon/pen) || istype(O, /obj/item/device/pda))
 		return
 
 	target = user
diff --git a/html/changelogs/Sindorman-beepsky-fix.yml b/html/changelogs/Sindorman-beepsky-fix.yml
new file mode 100644
index 00000000000..5f66a81c47a
--- /dev/null
+++ b/html/changelogs/Sindorman-beepsky-fix.yml
@@ -0,0 +1,6 @@
+author: PoZe
+
+delete-after: True
+
+changes:
+  - bugfix: "Beepsky/ED209 will no longer arrest you for using pen or PDA on it"