diff --git a/code/modules/admin/verbs/panicbunker.dm b/code/modules/admin/verbs/panicbunker.dm
index e9b12dc5ba2..ff530656cbf 100644
--- a/code/modules/admin/verbs/panicbunker.dm
+++ b/code/modules/admin/verbs/panicbunker.dm
@@ -5,12 +5,11 @@
 		usr << "<span class='adminnotice'>The Database is not enabled!</span>"
 		return
 
-	if (!dbcon || !dbcon.IsConnected())
-		usr << "<span class='adminnotice'>The Database is not connected!</span>"
-		return
-
 	config.panic_bunker = (!config.panic_bunker)
+
 	log_admin("[key_name(usr)] has toggled the Panic Bunker, it is now [(config.panic_bunker?"on":"off")]")
-	message_admins("[key_name_admin(usr)] has toggled the Panic Bunker, it is now [(config.panic_bunker?"on":"off")]")
+	message_admins("[key_name_admin(usr)] has toggled the Panic Bunker, it is now [(config.panic_bunker?"enabled":"disabled")].")
+	if (config.panic_bunker && (!dbcon || !dbcon.IsConnected()))
+		message_admins("The Database is not connected! Panic bunker will not work until the connection is reestablished.")
 	feedback_add_details("admin_verb","PANIC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!