diff --git a/system/Database/Forge.php b/system/Database/Forge.php
index 9a9e7b0dc1f8..4687dc7f59cd 100644
--- a/system/Database/Forge.php
+++ b/system/Database/Forge.php
@@ -489,7 +489,7 @@ public function dropTable($table_name, $if_exists = false)
 		}
 
 		// If the prefix is already starting the table name, remove it...
-		if (strpos($table_name, $this->db->DBPrefix) === 0)
+		if (! empty($this->db->DBPrefix) && strpos($table_name, $this->db->DBPrefix) === 0)
 		{
 			$table_name = substr($table_name, strlen($this->db->DBPrefix));
 		}