diff --git a/administrator/components/com_modules/models/select.php b/administrator/components/com_modules/models/select.php
index f8633ed404a2c..d421aea9c70fa 100644
--- a/administrator/components/com_modules/models/select.php
+++ b/administrator/components/com_modules/models/select.php
@@ -34,7 +34,7 @@ protected function populateState($ordering = null, $direction = null)
 
 		// Load the filter state.
 		$clientId = $app->getUserState('com_modules.modules.client_id', 0);
-		$this->setState('filter.client_id', (int) $clientId);
+		$this->setState('client_id', (int) $clientId);
 
 		// Load the parameters.
 		$params = JComponentHelper::getParams('com_modules');
@@ -61,7 +61,7 @@ protected function populateState($ordering = null, $direction = null)
 	protected function getStoreId($id = '')
 	{
 		// Compile the store id.
-		$id .= ':' . $this->getState('filter.client_id');
+		$id .= ':' . $this->getState('client_id');
 
 		return parent::getStoreId($id);
 	}
@@ -90,7 +90,7 @@ protected function getListQuery()
 		$query->where('a.type = ' . $db->quote('module'));
 
 		// Filter by client.
-		$clientId = $this->getState('filter.client_id');
+		$clientId = $this->getState('client_id');
 		$query->where('a.client_id = ' . (int) $clientId);
 
 		// Filter by enabled
@@ -112,7 +112,7 @@ public function getItems()
 		// Get the list of items from the database.
 		$items = parent::getItems();
 
-		$client = JApplicationHelper::getClientInfo($this->getState('filter.client_id', 0));
+		$client = JApplicationHelper::getClientInfo($this->getState('client_id', 0));
 		$lang = JFactory::getLanguage();
 
 		// Loop through the results to add the XML metadata,
diff --git a/administrator/components/com_modules/views/modules/tmpl/default_batch.php b/administrator/components/com_modules/views/modules/tmpl/default_batch.php
index d584214e318be..454bd01c185d9 100644
--- a/administrator/components/com_modules/views/modules/tmpl/default_batch.php
+++ b/administrator/components/com_modules/views/modules/tmpl/default_batch.php
@@ -11,7 +11,7 @@
 
 defined('_JEXEC') or die;
 
-$clientId  = $this->state->get('filter.client_id');
+$clientId  = $this->state->get('client_id');
 
 // Show only Module Positions of published Templates
 $published = 1;
diff --git a/administrator/components/com_modules/views/modules/tmpl/default_batch_body.php b/administrator/components/com_modules/views/modules/tmpl/default_batch_body.php
index 4d0fee6bc231f..90b2539df0909 100644
--- a/administrator/components/com_modules/views/modules/tmpl/default_batch_body.php
+++ b/administrator/components/com_modules/views/modules/tmpl/default_batch_body.php
@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 
-$clientId  = $this->state->get('filter.client_id');
+$clientId  = $this->state->get('client_id');
 
 // Show only Module Positions of published Templates
 $published = 1;
diff --git a/administrator/templates/hathor/html/com_modules/modules/default.php b/administrator/templates/hathor/html/com_modules/modules/default.php
index 6cf65ab045c18..207ca24c4e1a1 100644
--- a/administrator/templates/hathor/html/com_modules/modules/default.php
+++ b/administrator/templates/hathor/html/com_modules/modules/default.php
@@ -15,7 +15,7 @@
 JHtml::_('behavior.multiselect');
 JHtml::_('behavior.modal');
 
-$client    = $this->state->get('filter.client_id') ? 'administrator' : 'site';
+$client    = $this->state->get('client_id') ? 'administrator' : 'site';
 $user      = JFactory::getUser();
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
@@ -46,7 +46,7 @@
 				<?php echo JText::_('JGLOBAL_FILTER_CLIENT'); ?>
 			</label>
 			<select name="client_id" id="client_id">
-				<?php echo JHtml::_('select.options', ModulesHelper::getClientOptions(), 'value', 'text', $this->state->get('filter.client_id'));?>
+				<?php echo JHtml::_('select.options', ModulesHelper::getClientOptions(), 'value', 'text', $this->state->get('client_id'));?>
 			</select>
 
             <label class="selectlabel" for="filter_state">
@@ -62,7 +62,7 @@
 			</label>
 			<select name="filter_position" id="filter_position">
 				<option value=""><?php echo JText::_('COM_MODULES_OPTION_SELECT_POSITION');?></option>
-				<?php echo JHtml::_('select.options', ModulesHelper::getPositions($this->state->get('filter.client_id')), 'value', 'text', $this->state->get('filter.position'));?>
+				<?php echo JHtml::_('select.options', ModulesHelper::getPositions($this->state->get('client_id')), 'value', 'text', $this->state->get('filter.position'));?>
 			</select>
 
 			<label class="selectlabel" for="filter_module">
@@ -70,7 +70,7 @@
 			</label>
 			<select name="filter_module" id="filter_module">
 				<option value=""><?php echo JText::_('COM_MODULES_OPTION_SELECT_MODULE');?></option>
-				<?php echo JHtml::_('select.options', ModulesHelper::getModules($this->state->get('filter.client_id')), 'value', 'text', $this->state->get('filter.module'));?>
+				<?php echo JHtml::_('select.options', ModulesHelper::getModules($this->state->get('client_id')), 'value', 'text', $this->state->get('filter.module'));?>
 			</select>
 
 			<label class="selectlabel" for="filter_access">