diff --git a/src/js/DarkTheme.js b/src/js/DarkTheme.js
index 4bb14bf6..2e8f1c0c 100644
--- a/src/js/DarkTheme.js
+++ b/src/js/DarkTheme.js
@@ -74,7 +74,7 @@ export function setDarkTheme(enabled) {
     DarkTheme.setConfig(enabled);
 
     checkSetupAnalytics(function (analyticsService) {
-        analyticsService.sendEvent(analyticsService.EVENT_CATEGORIES.APPLICATION, 'DarkTheme', enabled);
+        analyticsService.sendEvent(analyticsService.EVENT_CATEGORIES.APPLICATION, 'DarkTheme', { enabled: enabled });
     });
 }
 
diff --git a/src/js/main.js b/src/js/main.js
index e40aeaa2..14851ee9 100644
--- a/src/js/main.js
+++ b/src/js/main.js
@@ -104,7 +104,7 @@ function appReady() {
         startProcess();
 
         checkSetupAnalytics(function (analyticsService) {
-            analyticsService.sendEvent(analyticsService.EVENT_CATEGORIES.APPLICATION, 'SelectedLanguage', i18n.selectedLanguage);
+            analyticsService.sendEvent(analyticsService.EVENT_CATEGORIES.APPLICATION, 'SelectedLanguage', { language: i18n.selectedLanguage });
         });
 
         initializeSerialBackend();