diff --git a/client/src/boot/Sentry.ts b/client/src/boot/Sentry.ts
index 51fd7669b..6e45160dc 100644
--- a/client/src/boot/Sentry.ts
+++ b/client/src/boot/Sentry.ts
@@ -1,10 +1,10 @@
 import * as Sentry from '@sentry/browser';
 
-if (process.env.NODE_ENV !== 'development') {
-    Sentry.init({
-        dsn: 'https://02e4da31636d479f86a17a6ef749278c@sentry.io/1876151',
-        release: process.env.VERSION
-    });
-}
+// if (process.env.NODE_ENV !== 'development') {
+//     Sentry.init({
+//         dsn: 'https://02e4da31636d479f86a17a6ef749278c@sentry.io/1876151',
+//         release: process.env.VERSION
+//     });
+// }
 
 export default Sentry;
diff --git a/client/src/boot/index.tsx b/client/src/boot/index.tsx
index fb5753794..3a37b9bc1 100644
--- a/client/src/boot/index.tsx
+++ b/client/src/boot/index.tsx
@@ -1,4 +1,4 @@
-import Sentry from './Sentry';
+// import Sentry from './Sentry';
 
 import Logger from '../helpers/Logger';
 
@@ -19,7 +19,7 @@ import App from '../views/App';
 const log = new Logger('root');
 
 log.info(`booting v${process.env.VERSION}`);
-Sentry.captureMessage('start');
+// Sentry.captureMessage('start');
 
 declare var window: any;
 
diff --git a/server/src/boot/app.ts b/server/src/boot/app.ts
index cfd176af5..91f94675f 100644
--- a/server/src/boot/app.ts
+++ b/server/src/boot/app.ts
@@ -1,5 +1,5 @@
 import * as H5P from '@lumieducation/h5p-server';
-import * as Sentry from '@sentry/node';
+// import * as Sentry from '@sentry/node';
 import bodyParser from 'body-parser';
 import express from 'express';
 import fileUpload from 'express-fileupload';
@@ -98,7 +98,7 @@ export default async (serverConfig: IServerConfig) => {
     // );
 
     const app = express();
-    app.use(Sentry.Handlers.requestHandler());
+    // app.use(Sentry.Handlers.requestHandler());
 
     app.use(bodyParser.json({ limit: h5pEditor.config.maxTotalSize }));
     app.use(
@@ -132,10 +132,10 @@ export default async (serverConfig: IServerConfig) => {
 
     app.use('/', routes(h5pEditor, h5pPlayer, serverConfig));
 
-    app.use(Sentry.Handlers.errorHandler());
+    // app.use(Sentry.Handlers.errorHandler());
 
     app.use((error, req, res, next) => {
-        Sentry.captureException(error);
+        // Sentry.captureException(error);
         res.status(error.status || 500).json({
             code: error.code,
             message: error.message,
diff --git a/server/src/boot/setup.ts b/server/src/boot/setup.ts
index d0266bad1..d5e4af032 100644
--- a/server/src/boot/setup.ts
+++ b/server/src/boot/setup.ts
@@ -1,4 +1,4 @@
-import * as Sentry from '@sentry/node';
+// import * as Sentry from '@sentry/node';
 import fsExtra from 'fs-extra';
 
 import IServerConfig from '../IServerConfig';
@@ -47,7 +47,7 @@ export default async function setup(
             await h5pConfig.save();
         }
     } catch (error) {
-        Sentry.captureException(error);
+        // Sentry.captureException(error);
         throw error;
     }
 }
diff --git a/server/src/controllers/LumiController.ts b/server/src/controllers/LumiController.ts
index 8d0ff3831..f475c1e06 100644
--- a/server/src/controllers/LumiController.ts
+++ b/server/src/controllers/LumiController.ts
@@ -56,7 +56,7 @@ export default class LumiController {
         );
         await packageExporter.createPackage(contentId, stream, new User());
 
-        nucleus.track('export');
+        nucleus.track('save');
         return { path };
     }
 
diff --git a/server/src/main.ts b/server/src/main.ts
index 31766620e..5ca7f1b41 100644
--- a/server/src/main.ts
+++ b/server/src/main.ts
@@ -1,5 +1,5 @@
-import * as Sentry from '@sentry/electron';
-import * as SentryNode from '@sentry/node';
+// import * as Sentry from '@sentry/electron';
+// import * as SentryNode from '@sentry/node';
 import electron from 'electron';
 import log from 'electron-log';
 import nucleus from 'nucleus-nodejs';
@@ -24,12 +24,12 @@ process.on('uncaughtException', (error) => {
     log.error(error);
 });
 
-if (process.env.NODE_ENV !== 'development') {
-    Sentry.init({
-        dsn: 'https://02e4da31636d479f86a17a6ef749278c@sentry.io/1876151',
-        release: app.getVersion()
-    });
-}
+// if (process.env.NODE_ENV !== 'development') {
+//     Sentry.init({
+//         dsn: 'https://02e4da31636d479f86a17a6ef749278c@sentry.io/1876151',
+//         release: app.getVersion()
+//     });
+// }
 
 if (process.env.NODE_ENV !== 'development') {
     nucleus.init('5e284c9a73aa9c0115e0d1d6');
diff --git a/server/src/websocket.ts b/server/src/websocket.ts
index 929333b23..2f6c19e61 100644
--- a/server/src/websocket.ts
+++ b/server/src/websocket.ts
@@ -1,5 +1,5 @@
 import SocketIO from 'socket.io';
-import * as Sentry from '@sentry/node';
+// import * as Sentry from '@sentry/node';
 import http from 'http';
 
 import Logger from './helpers/Logger';
@@ -13,8 +13,8 @@ export default function (server: http.Server): SocketIO.Server {
         log.info('new connection');
     });
 
-    io.on('error', (error) => {
-        Sentry.captureException(error);
-    });
+    // io.on('error', (error) => {
+    //     Sentry.captureException(error);
+    // });
     return io;
 }