diff --git a/src/services/events.ts b/src/services/events.ts
index b87520d35..8b64d5af0 100644
--- a/src/services/events.ts
+++ b/src/services/events.ts
@@ -1,4 +1,4 @@
-const log = require('./log');
+import log from "./log";
 
 const NOTE_TITLE_CHANGED = "NOTE_TITLE_CHANGED";
 const ENTER_PROTECTED_SESSION = "ENTER_PROTECTED_SESSION";
diff --git a/src/services/utils.ts b/src/services/utils.ts
index c985c566e..1b75046d0 100644
--- a/src/services/utils.ts
+++ b/src/services/utils.ts
@@ -1,13 +1,15 @@
 "use strict";
 
 import crypto from "crypto";
-const randtoken = require('rand-token').generator({source: 'crypto'});
+import { generator } from "rand-token";
 import unescape from "unescape";
 import escape from "escape-html";
 import sanitize from "sanitize-filename";
 import mimeTypes from "mime-types";
 import path from "path";
 
+const randtoken = generator({source: 'crypto'});
+
 function newEntityId() {
     return randomString(12);
 }