diff --git a/client/src/app/api/eventsApi.js b/client/src/app/api/eventsApi.js
index 17a2ada40..70f2f946f 100644
--- a/client/src/app/api/eventsApi.js
+++ b/client/src/app/api/eventsApi.js
@@ -1,5 +1,5 @@
 import axios from 'axios';
-import { eventsURL } from '../api/apiConstants';
+import { eventsURL } from './apiConstants';
 
 export const fetchAllEvents = async () => {
   const res = await axios.get(eventsURL);
@@ -7,38 +7,31 @@ export const fetchAllEvents = async () => {
 };
 
 export const requestPost = async (data) => {
-  const res = await axios.post(eventsURL, data);
-  return res;
+  return await axios.post(eventsURL, data);
 };
 
 export const requestPut = async (data) => {
-  const res = await axios.put(eventsURL, data);
-  return res;
+  return await axios.put(eventsURL, data);
 };
 
 export const requestPatch = async (data) => {
-  const res = await axios.patch(eventsURL, data);
-  return res;
+  return await axios.patch(eventsURL, data);
 };
 
 export const requestReorder = async (data) => {
   const action = 'reorder';
-  const res = await axios.patch(eventsURL + '/' + action, data);
-  return res;
+  return await axios.patch(eventsURL + '/' + action, data);
 };
 
 export const requestApplyDelay = async (eventId) => {
   const action = 'applydelay';
-  const res = await axios.patch(eventsURL + '/' + action + '/' + eventId);
-  return res;
+  return await axios.patch(eventsURL + '/' + action + '/' + eventId);
 };
 
 export const requestDelete = async (eventId) => {
-  const res = await axios.delete(eventsURL + '/' + eventId);
-  return res;
+  return await axios.delete(eventsURL + '/' + eventId);
 };
 
 export const requestDeleteAll = async () => {
-  const res = await axios.delete(eventsURL + '/all');
-  return res;
+  return await axios.delete(eventsURL + '/all');
 };
diff --git a/client/src/features/editors/EventBlock/EventBlock.jsx b/client/src/features/editors/EventBlock/EventBlock.jsx
index 261370e61..81946eb79 100644
--- a/client/src/features/editors/EventBlock/EventBlock.jsx
+++ b/client/src/features/editors/EventBlock/EventBlock.jsx
@@ -17,7 +17,7 @@ import PropTypes from 'prop-types';
 const ExpandedBlock = (props) => {
   const { provided, data, eventIndex, next, delay, delayValue, previousEnd, actionHandler } = props;
 
-  const oscid = data.id.length > 4 ? '...' : data.id;
+  const oscid = data?.id || '...';
 
   // if end is before, assume is the day after
   const duration =
diff --git a/server/package.json b/server/package.json
index 94791369d..db77f5f01 100644
--- a/server/package.json
+++ b/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ontime",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "author": "Carlos Valente",
   "description": "Time keeping for live events",
   "repository": "https://github.com/cpvalente/ontime",
diff --git a/server/src/controllers/eventsController.js b/server/src/controllers/eventsController.js
index d5e1aec76..290671253 100644
--- a/server/src/controllers/eventsController.js
+++ b/server/src/controllers/eventsController.js
@@ -94,10 +94,7 @@ export const eventsPost = async (req, res) => {
 
   // ensure structure
   let newEvent = {};
-  let id = req.body.id;
-  if (data.events.find((e) => e.id === id)) {
-    id = generateId();
-  }
+  const id = generateId();
 
   switch (req.body.type) {
     case 'event':
diff --git a/server/src/routes/__tests__/eventsRouter.test.js b/server/src/routes/__tests__/eventsRouter.test.js
index 56f41b682..490573e99 100644
--- a/server/src/routes/__tests__/eventsRouter.test.js
+++ b/server/src/routes/__tests__/eventsRouter.test.js
@@ -16,12 +16,22 @@ const testEvent = {
   id: 'superSpecial12',
 };
 
+const eventFromDb = {
+  title: 'Welcome to Ontime',
+  subtitle: 'Subtitles are useful',
+  presenter: 'cpvalente',
+  note: 'Maybe a running note for the operator?',
+  timeStart: 28800000,
+  timeEnd: 30600000,
+  isPublic: false,
+  type: 'event',
+  revision: 7,
+  id: '5946',
+};
+
 describe('When a POST request is sent', () => {
   test('POST /event should return a 201', async () => {
-    await supertest(server)
-      .post('/events')
-      .send(testEvent)
-      .expect(201)
+    await supertest(server).post('/events').send(testEvent).expect(201);
   });
 });
 
@@ -38,20 +48,20 @@ describe('When a GET request request is sent', () => {
   });
   test('GET /events/:eventId returns a valid object', async () => {
     await supertest(server)
-      .get(`/events/${testEvent.id}`)
+      .get(`/events/${eventFromDb.id}`)
       .expect(200)
       .then((response) => {
         expect(response.text.includes('<!doctype html>')).toBe(false);
         expect(response.body).toBeDefined();
-        expect(response.body.title).toBe(testEvent.title);
-        expect(response.body.subtitle).toBe(testEvent.subtitle);
-        expect(response.body.presenter).toBe(testEvent.presenter);
-        expect(response.body.note).toBe(testEvent.note);
-        expect(response.body.timeStart).toBe(testEvent.timeStart);
-        expect(response.body.timeEnd).toBe(testEvent.timeEnd);
-        expect(response.body.isPublic).toBe(testEvent.isPublic);
-        expect(response.body.type).toBe(testEvent.type);
-        expect(response.body.id).toBe(testEvent.id);
+        expect(response.body.title).toBe(eventFromDb.title);
+        expect(response.body.subtitle).toBe(eventFromDb.subtitle);
+        expect(response.body.presenter).toBe(eventFromDb.presenter);
+        expect(response.body.note).toBe(eventFromDb.note);
+        expect(response.body.timeStart).toBe(eventFromDb.timeStart);
+        expect(response.body.timeEnd).toBe(eventFromDb.timeEnd);
+        expect(response.body.isPublic).toBe(eventFromDb.isPublic);
+        expect(response.body.type).toBe(eventFromDb.type);
+        expect(response.body.id).toBe(eventFromDb.id);
       });
   });
 });
diff --git a/server/src/utils/__tests__/parser.tests.js b/server/src/utils/__tests__/parser.tests.js
index 007854f1e..7b3efc921 100644
--- a/server/src/utils/__tests__/parser.tests.js
+++ b/server/src/utils/__tests__/parser.tests.js
@@ -489,8 +489,12 @@ describe('test parseExcel function', () => {
     const parsedData = await parseExcel_v1(testdata);
 
     expect(parsedData.events).toBeDefined();
-    expect(parsedData.events).toStrictEqual(expectedParsedEvents);
-    expect(parsedData.events).toStrictEqual(expectedParsedEvents);
+    expect(parsedData.events.title).toBe(expectedParsedEvents.title);
+    expect(parsedData.events.presenter).toBe(expectedParsedEvents.presenter);
+    expect(parsedData.events.subtitle).toBe(expectedParsedEvents.subtitle);
+    expect(parsedData.events.isPublic).toBe(expectedParsedEvents.isPublic);
+    expect(parsedData.events.note).toBe(expectedParsedEvents.note);
+    expect(parsedData.events.type).toBe(expectedParsedEvents.type);
   });
 });