diff --git a/administrator/components/com_config/forms/application.xml b/administrator/components/com_config/forms/application.xml
index 8b3121127b842..62aea1a9bdfc4 100644
--- a/administrator/components/com_config/forms/application.xml
+++ b/administrator/components/com_config/forms/application.xml
@@ -952,6 +952,20 @@
 			<option value="1">JYES</option>
 		</field>
 
+		<field
+			name="session_metadata_for_guest"
+			type="radio"
+			label="COM_CONFIG_FIELD_SESSION_METADATA_GUEST_LABEL"
+			description="COM_CONFIG_FIELD_SESSION_METADATA_GUEST_DESC"
+			layout="joomla.form.field.radio.switcher"
+			default="1"
+			filter="boolean"
+			showon="session_metadata:1"
+			>
+			<option value="0">JNO</option>
+			<option value="1">JYES</option>
+		</field>
+
 	</fieldset>
 
 	<fieldset
diff --git a/administrator/language/en-GB/com_config.ini b/administrator/language/en-GB/com_config.ini
index 55e1413e7ed0a..9cf76faf5aa1f 100644
--- a/administrator/language/en-GB/com_config.ini
+++ b/administrator/language/en-GB/com_config.ini
@@ -167,6 +167,8 @@ COM_CONFIG_FIELD_SERVER_TIMEZONE_LABEL="Website Time Zone"
 COM_CONFIG_FIELD_SESSION_HANDLER_LABEL="Session Handler"
 COM_CONFIG_FIELD_SESSION_METADATA_DESC="If enabled, additional metadata about a user's session (including their username, user ID, and which application they are logged into) will be logged to the session database table.<br>If disabled, features dependent on this data will be unavailable."
 COM_CONFIG_FIELD_SESSION_METADATA_LABEL="Track Session Metadata"
+COM_CONFIG_FIELD_SESSION_METADATA_GUEST_DESC="If enabled, additional metadata about both registered and non registered user's session will be logged to the session database table. <br>If disabled, only data for registered user will be logged."
+COM_CONFIG_FIELD_SESSION_METADATA_GUEST_LABEL="Track Guest Session Metadata"
 COM_CONFIG_FIELD_SESSION_TIME_LABEL="Session Lifetime (minutes)"
 COM_CONFIG_FIELD_SHARED_SESSION_DESC="When enabled, a user's session is shared between the frontend and administrator sections of the site. Note that changing this value will invalidate all existing sessions on the site. This is not available when the \"Force HTTPS\" option is set to \"Administrator Only\"."
 COM_CONFIG_FIELD_SHARED_SESSION_LABEL="Shared Sessions"
diff --git a/libraries/src/Session/EventListener/MetadataManagerListener.php b/libraries/src/Session/EventListener/MetadataManagerListener.php
index 59633cc8ff6f9..81b414bf5c249 100644
--- a/libraries/src/Session/EventListener/MetadataManagerListener.php
+++ b/libraries/src/Session/EventListener/MetadataManagerListener.php
@@ -62,9 +62,20 @@ public function __construct(MetadataManager $metadataManager, Registry $config)
 	 */
 	public function onAfterSessionStart(SessionEvent $event)
 	{
-		if ($this->config->get('session_metadata', true) && $event->getSession()->has('user'))
+		// Whether to track Session Metadata
+		if (!$this->config->get('session_metadata', true) || !$event->getSession()->has('user'))
 		{
-			$this->metadataManager->createOrUpdateRecord($event->getSession(), $event->getSession()->get('user'));
+			return;
 		}
+
+		$user = $event->getSession()->get('user');
+
+		// Whether to track Session Metadata for Guest user
+		if (!$this->config->get('session_metadata_for_guest', true) && !$user->id)
+		{
+			return;
+		}
+
+		$this->metadataManager->createOrUpdateRecord($event->getSession(), $user);
 	}
 }