diff --git a/classes/module/ModuleObject.class.php b/classes/module/ModuleObject.class.php
index df397e020..c0861660d 100644
--- a/classes/module/ModuleObject.class.php
+++ b/classes/module/ModuleObject.class.php
@@ -226,9 +226,9 @@ class ModuleObject extends BaseObject
 			}
 
 			// Refresh session
-			if (!isset($_SESSION['RHYMIX']['admin_accessed']))
+			if (!isset($_SESSION['RHYMIX']['admin_accessed']) && !headers_sent())
 			{
-				if (!headers_sent())
+				if (!isset($_SESSION['RHYMIX']['last_refresh']) || $_SESSION['RHYMIX']['last_refresh'] < time() - 10)
 				{
 					$_SESSION['RHYMIX']['admin_accessed'] = \RX_TIME;
 					Rhymix\Framework\Session::refresh(true);
diff --git a/common/framework/Session.php b/common/framework/Session.php
index 1891a0e8b..4cf729897 100644
--- a/common/framework/Session.php
+++ b/common/framework/Session.php
@@ -446,7 +446,7 @@ class Session
 		if ($refresh)
 		{
 			self::checkLoginStatusCookie();
-			return self::refresh(true);
+			return $_SESSION['RHYMIX']['next_refresh'] = true;
 		}
 		else
 		{