diff --git a/core/userrights.class.inc.php b/core/userrights.class.inc.php
index fba6c6a630..4bfea75a84 100644
--- a/core/userrights.class.inc.php
+++ b/core/userrights.class.inc.php
@@ -657,8 +657,8 @@ class UserRights
 		}
 		else
 		{
-			// As of now, anybody can swith to the archive mode
-			$bRet = true;
+			// As of now, anybody can switch to the archive mode as soon as there is an archivable class
+			$bRet = (count(MetaModel::EnumArchivableClasses()) > 0);
 			$_SESSION['archive_allowed'] = $bRet;
 		}
 		return $bRet;