diff --git a/file/lib/data/room/RoomAction.class.php b/file/lib/data/room/RoomAction.class.php
index 17cb765..edf6bbb 100644
--- a/file/lib/data/room/RoomAction.class.php
+++ b/file/lib/data/room/RoomAction.class.php
@@ -323,27 +323,28 @@ public function removeDeadUsers() {
 	/**
 	 * Validates permissions.
 	 */
-	public function validateGetDashboardRoomList() {
+	public function validateGetBoxRoomList() {
 		if (!MODULE_CHAT) throw new \wcf\system\exception\IllegalLinkException();
 	}
 	
 	/**
 	 * Returns dashboard roomlist.
 	 */
-	public function getDashboardRoomList() {
+	public function getBoxRoomList() {
 		$rooms = RoomCache::getInstance()->getRooms();
 		
 		foreach ($rooms as $key => $room) {
 			if (!$room->canEnter()) unset($rooms[$key]);
 		}
 		
+		$this->readBoolean('showEmptyRooms', true);
 		\wcf\system\WCF::getTPL()->assign(array(
 			'rooms' => $rooms,
-			'onlyList' => true
+			'showEmptyRooms' => $this->parameters['showEmptyRooms']
 		));
 		
 		return array(
-			'template' => \wcf\system\WCF::getTPL()->fetch('dashboardBoxOnlineList', 'chat')
+			'template' => \wcf\system\WCF::getTPL()->fetch('boxRoomList', 'chat')
 		);
 	}
 }
diff --git a/template/boxRoomList.tpl b/template/boxRoomList.tpl
new file mode 100644
index 0000000..31c6e1e
--- /dev/null
+++ b/template/boxRoomList.tpl
@@ -0,0 +1,22 @@
+{foreach from=$rooms item='room'}
+	{assign var='users' value=$room->getUsers()}
+	
+	{if $showEmptyRooms || $users|count > 0}
+		<li>
+			<div>
+				<div>
+					<div class="containerHeadline">
+						<h3><a href="{link application='chat' controller='Chat' object=$room}{/link}">{$room}</a> <span class="badge">{#$users|count}</span></h3>
+						<p>{$room->topic|language}</p>
+					</div>
+					
+					<ul class="dataList">
+						{foreach from=$users item='user'}
+							<li><a href="{link controller='User' object=$user}{/link}" class="userLink" data-user-id="{$user->userID}">{$user}</a></li>
+						{/foreach}
+					</ul>
+				</div>
+			</div>
+		</li>
+	{/if}
+{/foreach}
diff --git a/template/chat.tpl b/template/chat.tpl
index cfec043..1698b2e 100644
--- a/template/chat.tpl
+++ b/template/chat.tpl
@@ -161,29 +161,33 @@
 			<h1>{lang}chat.general.title{/lang}</h1>
 		</header>
 		
-		<div class="container marginTop">
+		<div id="chatRoomListContainer" class="container marginTop">
 			<ul class="containerList">
-				{foreach from=$rooms item='room'}
-					{assign var='users' value=$room->getUsers()}
-					
-					<li>
-						<div>
-							<div>
-								<div class="containerHeadline">
-									<h3><a href="{link application='chat' controller='Chat' object=$room}{/link}">{$room}</a> <span class="badge">{#$users|count}</span></h3>
-									<p>{$room->topic|language}</p>
-								</div>
-								
-								<ul class="dataList">
-									{foreach from=$users item='user'}
-										<li><a href="{link controller='User' object=$user}{/link}" class="userLink" data-user-id="{$user->userID}">{$user}</a></li>
-									{/foreach}
-								</ul>
-							</div>
-						</div>
-					</li>
-				{/foreach}
+				{include application='chat' file='boxRoomList' showEmptyRooms=true}
 			</ul>
+			<script data-relocate="true">
+				//<![CDATA[
+				(function($, window, undefined) {
+					proxy = new WCF.Action.Proxy({
+						data: {
+							actionName: 'getBoxRoomList',
+							className: 'chat\\data\\room\\RoomAction',
+							parameters: {
+								showEmptyRooms: 1
+							}
+						},
+						showLoadingOverlay: false,
+						suppressErrors: true,
+						success: function(data) {
+							$('#chatRoomListContainer ul').html(data.returnValues.template);
+						}
+					});
+					
+					be.bastelstu.wcf.nodePush.onMessage('be.bastelstu.chat.join', $.proxy(proxy.sendRequest, proxy));
+					be.bastelstu.wcf.nodePush.onMessage('be.bastelstu.chat.leave', $.proxy(proxy.sendRequest, proxy));
+				})(jQuery, this);
+				//]]>
+			</script>
 		</div>
 	{/if}
 	
diff --git a/template/dashboardBoxOnlineList.tpl b/template/dashboardBoxOnlineList.tpl
index f3f1ada..bdd02a6 100644
--- a/template/dashboardBoxOnlineList.tpl
+++ b/template/dashboardBoxOnlineList.tpl
@@ -1,62 +1,39 @@
-{capture assign='roomList'}
-	{foreach from=$rooms item='room'}
-		{assign var='users' value=$room->getUsers()}
-		
-		{if $users|count > 0}
-			<li>
-				<div>
-					<div>
-						<div class="containerHeadline">
-							<h3><a href="{link application='chat' controller='Chat' object=$room}{/link}">{$room}</a> <span class="badge">{#$users|count}</span></h3>
-							<p>{$room->topic|language}</p>
-						</div>
-						
-						<ul class="dataList">
-							{foreach from=$users item='user'}
-								<li><a href="{link controller='User' object=$user}{/link}" class="userLink" data-user-id="{$user->userID}">{$user}</a></li>
-							{/foreach}
-						</ul>
-					</div>
-				</div>
-			</li>
-		{/if}
-	{/foreach}
-{/capture}
-{if $onlyList|isset}
-	{@$roomList}
-{else}
-	<div id="chatDashboardBoxOnlineListContainer" {if !$roomList|trim} style="display: none;"{/if}>
-		<header class="boxHeadline boxSubHeadline">
-			<h2>{lang}chat.header.menu.chat{/lang}</h2>
-		</header>
+{capture assign='roomList'}{include application='chat' file='boxRoomList' showEmptyRooms=false}{/capture}
 
-		<div class="container marginTop">
-			<ul class="containerList">
-				{@$roomList}
-			</ul>
-		</div>
-		<script data-relocate="true">
-			//<![CDATA[
-			(function($, window, undefined) {
-				proxy = new WCF.Action.Proxy({
-					data: {
-						actionName: 'getDashboardRoomList',
-						className: 'chat\\data\\room\\RoomAction'
-					},
-					showLoadingOverlay: false,
-					suppressErrors: true,
-					success: function(data) {
-						if (data.returnValues.template) $('#chatDashboardBoxOnlineListContainer').show();
-						else $('#chatDashboardBoxOnlineListContainer').hide();
-						
-						$('#chatDashboardBoxOnlineListContainer ul').html(data.returnValues.template);
-					}
-				});
-				
-				be.bastelstu.wcf.nodePush.onMessage('be.bastelstu.chat.join', $.proxy(proxy.sendRequest, proxy));
-				be.bastelstu.wcf.nodePush.onMessage('be.bastelstu.chat.leave', $.proxy(proxy.sendRequest, proxy));
-			})(jQuery, this);
-			//]]>
-		</script>
+<div id="chatDashboardBoxOnlineListContainer"{if !$roomList|trim} style="display: none;"{/if}>
+	<header class="boxHeadline boxSubHeadline">
+		<h2>{lang}chat.header.menu.chat{/lang}</h2>
+	</header>
+
+	<div class="container marginTop">
+		<ul class="containerList">
+			{@$roomList}
+		</ul>
 	</div>
-{/if}
+	<script data-relocate="true">
+		//<![CDATA[
+		(function($, window, undefined) {
+			proxy = new WCF.Action.Proxy({
+				data: {
+					actionName: 'getBoxRoomList',
+					className: 'chat\\data\\room\\RoomAction',
+					parameters: {
+						showEmptyRooms: 0
+					}
+				},
+				showLoadingOverlay: false,
+				suppressErrors: true,
+				success: function(data) {
+					if (data.returnValues.template) $('#chatDashboardBoxOnlineListContainer').show();
+					else $('#chatDashboardBoxOnlineListContainer').hide();
+					
+					$('#chatDashboardBoxOnlineListContainer ul').html(data.returnValues.template);
+				}
+			});
+			
+			be.bastelstu.wcf.nodePush.onMessage('be.bastelstu.chat.join', $.proxy(proxy.sendRequest, proxy));
+			be.bastelstu.wcf.nodePush.onMessage('be.bastelstu.chat.leave', $.proxy(proxy.sendRequest, proxy));
+		})(jQuery, this);
+		//]]>
+	</script>
+</div>