diff --git a/docker/docker-compose.matomo.yml b/docker/docker-compose.matomo.yml
new file mode 100644
index 0000000000000000000000000000000000000000..a0a90254efbabe79f3c8bc443e950f93537fd7e4
--- /dev/null
+++ b/docker/docker-compose.matomo.yml
@@ -0,0 +1,38 @@
+version: '3.8'
+
+services:
+  db:
+    image: mariadb
+    command: --max-allowed-packet=64MB
+    restart: always
+    environment:
+      - MYSQL_ROOT_PASSWORD=root
+      - MYSQL_PASSWORD=password
+      - MYSQL_DATABASE=matomo
+      - MYSQL_USER=matomo
+    volumes:
+      - db:/var/lib/mysql
+
+  app:
+    image: matomo:latest
+    restart: always
+    depends_on:
+      - db
+    environment:
+      - MATOMO_DATABASE_HOST=db
+      - MATOMO_DATABASE_ADAPTER=mysql
+      - MATOMO_DATABASE_TABLES_PREFIX=matomo_
+      - MATOMO_DATABASE_USERNAME=matomo
+      - MATOMO_DATABASE_PASSWORD=password
+      - MATOMO_DATABASE_DBNAME=matomo
+      - PHP_MEMORY_LIMIT=2048M
+    volumes:
+      # - ./config:/var/www/html/config:rw
+      # - ./logs:/var/www/html/logs
+      - matomo:/var/www/html
+    ports:
+      - 9800:80
+
+volumes:
+  db:
+  matomo:
diff --git a/src/components/App.tsx b/src/components/App.tsx
index 3e3222de29ac1428f8991c3444a5e5c5c9122d6d..d86299f0c29ce3228475fb39f2c26657fc442df2 100644
--- a/src/components/App.tsx
+++ b/src/components/App.tsx
@@ -12,6 +12,7 @@ import SplashScreen from 'components/Splash/SplashScreen'
 import SplashScreenError from 'components/Splash/SplashScreenError'
 import WelcomeModal from 'components/Onboarding/WelcomeModal'
 import MatomoTracker from 'utils/matomoTracker'
+import EnvironmentService from 'services/environment.service'
 
 interface AppProps {
   tracker: MatomoTracker
@@ -22,9 +23,10 @@ export const App = ({ tracker }: AppProps) => {
     (state: AppStore) => state.ecolyo.profile
   )
   const { termsStatus } = useSelector((state: AppStore) => state.ecolyo.global)
+  const isDev = new EnvironmentService().isDev()
 
   useEffect(() => {
-    if (tracker) {
+    if (tracker && !isDev) {
       if (termsStatus.accepted) {
         tracker.connectToHistory()
       }
diff --git a/src/services/environment.service.ts b/src/services/environment.service.ts
index 0fb89f8f4f67c7ba49f64e067885c293c33c708c..4537dc15976b1cf42f08d60968eac65aa9535d47 100644
--- a/src/services/environment.service.ts
+++ b/src/services/environment.service.ts
@@ -1,4 +1,5 @@
 declare const __IS_ALPHA__: boolean
+declare const __DEVELOPMENT__: boolean
 
 export default class EnvironmentService {
   private isAlpha() {
@@ -21,4 +22,8 @@ export default class EnvironmentService {
       return 'https://ecolyo-agent-rec.grandlyon.com'
     }
   }
+
+  public isDev() {
+    return __DEVELOPMENT__
+  }
 }