diff --git a/system/pages/houses.php b/system/pages/houses.php
index 954ef78918..db1a69926b 100644
--- a/system/pages/houses.php
+++ b/system/pages/houses.php
@@ -143,8 +143,20 @@
     if($type == 'guildhalls' && !$db->hasColumn('houses', 'guild'))
         $type = 'all';
 
-    if(!empty($type) && $type != 'all')
-        $whereby .= ' AND `guild` ' . ($type == 'guildhalls' ? '!' : '') . '= 0';
+	if (!empty($type) && $type != 'all')
+	{
+		$guildColumn = '';
+		if ($db->hasColumn('houses', 'guild')) {
+			$guildColumn = 'guild';
+		}
+		else if ($db->hasColumn('houses', 'guildid')) {
+			$guildColumn = 'guildid';
+		}
+
+		if($guildColumn !== '') {
+			$whereby .= ' AND `' . $guildColumn . '` ' . ($type == 'guildhalls' ? '!' : '') . '= 0';
+		}
+	}
 
     $houses_info = $db->query('SELECT * FROM `houses` WHERE ' . $whereby. ' ORDER BY ' . $orderby);