diff --git a/server/route/api/v1/shortcut_service.go b/server/route/api/v1/shortcut_service.go
index 9562793..8205fac 100644
--- a/server/route/api/v1/shortcut_service.go
+++ b/server/route/api/v1/shortcut_service.go
@@ -262,6 +262,7 @@ func (s *APIV1Service) GetShortcutAnalytics(ctx context.Context, request *v1pb.G
 		Type:              store.ActivityShortcutView,
 		PayloadShortcutID: &shortcut.Id,
 	}
+	// For non-advanced analytics users, we limit the activity to the last 14 days.
 	if !s.LicenseService.IsFeatureEnabled(license.FeatureTypeAdvancedAnalytics) {
 		createdTsAfter := time.Now().AddDate(0, 0, -14).Unix()
 		activityFind.CreatedTsAfter = &createdTsAfter
diff --git a/server/service/license/feature_matrix.go b/server/service/license/feature_matrix.go
index 1b8daea..ad3b8f7 100644
--- a/server/service/license/feature_matrix.go
+++ b/server/service/license/feature_matrix.go
@@ -39,8 +39,8 @@ var FeatureMatrix = map[FeatureType][3]bool{
 	FeatureTypeUnlimitedShortcuts:   {false, true, true},
 	FeatureTypeUnlimitedCollections: {false, true, true},
 	FeatureTypeCustomeBranding:      {false, false, true},
-	FeatureTypeSSO:                  {false, false, false},
-	FeatureTypeAdvancedAnalytics:    {false, false, false},
+	FeatureTypeSSO:                  {false, false, true},
+	FeatureTypeAdvancedAnalytics:    {false, false, true},
 }
 
 func getDefaultFeatures(plan v1pb.PlanType) []FeatureType {