diff --git a/inc/config.php b/inc/config.php
index 2b271ee2..d75f0e48 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -628,6 +628,9 @@
 	// Example: Custom secure tripcode.
 	// $config['custom_tripcode']['##securetrip'] = '!!somethingelse';
 
+	//Disable tripcodes. This will make it so all new posts will act as if no tripcode exists.
+	$config['disable_tripcodes'] = false;
+
 	// Allow users to mark their image as a "spoiler" when posting. The thumbnail will be replaced with a
 	// static spoiler image instead (see $config['spoiler_image']).
 	$config['spoiler_images'] = false;
diff --git a/post.php b/post.php
index e3f0682d..aba6c6be 100644
--- a/post.php
+++ b/post.php
@@ -850,7 +850,12 @@ if (isset($_POST['delete'])) {
 
 	$trip = generate_tripcode($post['name']);
 	$post['name'] = $trip[0];
-	$post['trip'] = isset($trip[1]) ? $trip[1] : ''; // XX: Dropped posts and tripcodes
+	if ($config['disable_tripcodes'] = true && !$mod) {
+		$post['trip'] = '';
+	}
+	else {
+		$post['trip'] = isset($trip[1]) ? $trip[1] : ''; // XX: Dropped posts and tripcodes
+	}
 
 	$noko = false;
 	if (strtolower($post['email']) == 'noko') {