diff --git a/libraries/cms/application/cms.php b/libraries/cms/application/cms.php
index 58070a96d1cdf..0254e04bd83e5 100644
--- a/libraries/cms/application/cms.php
+++ b/libraries/cms/application/cms.php
@@ -590,16 +590,14 @@ public function getUserStateFromRequest($key, $request, $default = null, $type =
 		$cur_state = $this->getUserState($key, $default);
 		$new_state = $this->input->get($request, null, $type);
 
-		// Save the new value only if it was set in this request.
-		if ($new_state !== null)
-		{
-			$this->setUserState($key, $new_state);
-		}
-		else
+		if ($new_state === null)
 		{
-			$new_state = $cur_state;
+			return $cur_state;
 		}
 
+		// Save the new value only if it was set in this request.
+		$this->setUserState($key, $new_state);
+
 		return $new_state;
 	}