diff --git a/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoParticipantEndpointConfig.java b/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoParticipantEndpointConfig.java
index 9498a7a9..95f8b552 100644
--- a/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoParticipantEndpointConfig.java
+++ b/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoParticipantEndpointConfig.java
@@ -42,7 +42,7 @@ public class KurentoParticipantEndpointConfig {
 		endpoint.getWebEndpoint().addMediaFlowInStateChangeListener(event -> {
 			String msg = "KMS event [MediaFlowInStateChange] -> endpoint: " + endpoint.getEndpointName() + " ("
 					+ typeOfEndpoint + ") | state: " + event.getState() + " | pad: " + event.getPadName()
-					+ " | mediaType: " + event.getMediaType() + " | timestamp: " + event.getTimestamp();
+					+ " | mediaType: " + event.getMediaType() + " | timestamp: " + event.getTimestampMillis();
 			KmsEvent kmsEvent = new KmsMediaEvent(event, endpoint.getOwner(), endpoint.getEndpointName(),
 					event.getMediaType(), endpoint.createdAt());
 			endpoint.kmsEvents.add(kmsEvent);
@@ -54,7 +54,7 @@ public class KurentoParticipantEndpointConfig {
 		endpoint.getWebEndpoint().addMediaFlowOutStateChangeListener(event -> {
 			String msg = "KMS event [MediaFlowOutStateChange] -> endpoint: " + endpoint.getEndpointName() + " ("
 					+ typeOfEndpoint + ") | state: " + event.getState() + " | pad: " + event.getPadName()
-					+ " | mediaType: " + event.getMediaType() + " | timestamp: " + event.getTimestamp();
+					+ " | mediaType: " + event.getMediaType() + " | timestamp: " + event.getTimestampMillis();
 			KmsEvent kmsEvent = new KmsMediaEvent(event, endpoint.getOwner(), endpoint.getEndpointName(),
 					event.getMediaType(), endpoint.createdAt());
 			endpoint.kmsEvents.add(kmsEvent);
@@ -65,7 +65,7 @@ public class KurentoParticipantEndpointConfig {
 
 		endpoint.getWebEndpoint().addIceGatheringDoneListener(event -> {
 			String msg = "KMS event [IceGatheringDone] -> endpoint: " + endpoint.getEndpointName() + " ("
-					+ typeOfEndpoint + ") | timestamp: " + event.getTimestamp();
+					+ typeOfEndpoint + ") | timestamp: " + event.getTimestampMillis();
 			KmsEvent kmsEvent = new KmsEvent(event, endpoint.getOwner(), endpoint.getEndpointName(),
 					endpoint.createdAt());
 			endpoint.kmsEvents.add(kmsEvent);
@@ -77,7 +77,7 @@ public class KurentoParticipantEndpointConfig {
 		endpoint.getWebEndpoint().addConnectionStateChangedListener(event -> {
 			String msg = "KMS event [ConnectionStateChanged]: -> endpoint: " + endpoint.getEndpointName() + " ("
 					+ typeOfEndpoint + ") | oldState: " + event.getOldState() + " | newState: " + event.getNewState()
-					+ " | timestamp: " + event.getTimestamp();
+					+ " | timestamp: " + event.getTimestampMillis();
 			KmsEvent kmsEvent = new KmsEvent(event, endpoint.getOwner(), endpoint.getEndpointName(),
 					endpoint.createdAt());
 			endpoint.kmsEvents.add(kmsEvent);
@@ -91,7 +91,7 @@ public class KurentoParticipantEndpointConfig {
 			endpoint.selectedRemoteIceCandidate = event.getCandidatePair().getRemoteCandidate();
 			String msg = "KMS event [NewCandidatePairSelected]: -> endpoint: " + endpoint.getEndpointName() + " ("
 					+ typeOfEndpoint + ") | local: " + endpoint.selectedLocalIceCandidate + " | remote: "
-					+ endpoint.selectedRemoteIceCandidate + " | timestamp: " + event.getTimestamp();
+					+ endpoint.selectedRemoteIceCandidate + " | timestamp: " + event.getTimestampMillis();
 			KmsEvent kmsEvent = new KmsEvent(event, endpoint.getOwner(), endpoint.getEndpointName(),
 					endpoint.createdAt());
 			endpoint.kmsEvents.add(kmsEvent);
@@ -103,7 +103,7 @@ public class KurentoParticipantEndpointConfig {
 		endpoint.getEndpoint().addMediaTranscodingStateChangeListener(event -> {
 			String msg = "KMS event [MediaTranscodingStateChange]: -> endpoint: " + endpoint.getEndpointName() + " ("
 					+ typeOfEndpoint + ") | state: " + event.getState().name() + " | mediaType: " + event.getMediaType()
-					+ " | binName: " + event.getBinName() + " | timestamp: " + event.getTimestamp();
+					+ " | binName: " + event.getBinName() + " | timestamp: " + event.getTimestampMillis();
 			KmsEvent kmsEvent = new KmsMediaEvent(event, endpoint.getOwner(), endpoint.getEndpointName(),
 					event.getMediaType(), endpoint.createdAt());
 			endpoint.kmsEvents.add(kmsEvent);
@@ -117,7 +117,7 @@ public class KurentoParticipantEndpointConfig {
 			String msg = "KMS event [IceComponentStateChange]: -> endpoint: " + endpoint.getEndpointName() + " ("
 					+ typeOfEndpoint + ") | state: " + event.getState().name() + " | componentId: "
 					+ event.getComponentId() + " | streamId: " + event.getStreamId() + " | timestamp: "
-					+ event.getTimestamp();
+					+ event.getTimestampMillis();
 			KmsEvent kmsEvent = new KmsEvent(event, endpoint.getOwner(), endpoint.getEndpointName(),
 					endpoint.createdAt());
 			endpoint.kmsEvents.add(kmsEvent);
@@ -130,7 +130,7 @@ public class KurentoParticipantEndpointConfig {
 		endpoint.getWebEndpoint().addErrorListener(event -> {
 			String msg = "KMS event [ERROR]: -> endpoint: " + endpoint.getEndpointName() + " (" + typeOfEndpoint
 					+ ") | errorCode: " + event.getErrorCode() + " | description: " + event.getDescription()
-					+ " | timestamp: " + event.getTimestamp();
+					+ " | timestamp: " + event.getTimestampMillis();
 			KmsEvent kmsEvent = new KmsEvent(event, endpoint.getOwner(), endpoint.getEndpointName(),
 					endpoint.createdAt());
 			endpoint.kmsEvents.add(kmsEvent);
diff --git a/openvidu-server/src/main/java/io/openvidu/server/kurento/endpoint/KmsEvent.java b/openvidu-server/src/main/java/io/openvidu/server/kurento/endpoint/KmsEvent.java
index ae1f4ddf..0b879f98 100644
--- a/openvidu-server/src/main/java/io/openvidu/server/kurento/endpoint/KmsEvent.java
+++ b/openvidu-server/src/main/java/io/openvidu/server/kurento/endpoint/KmsEvent.java
@@ -36,7 +36,7 @@ public class KmsEvent {
 		this.event = event;
 		this.participant = participant;
 		this.endpoint = endpointName;
-		this.timestamp = System.currentTimeMillis(); // TODO: Change to event.getTimestampMillis()
+		this.timestamp = Long.parseLong(event.getTimestampMillis());
 		this.msSinceCreation = this.timestamp - createdAt;
 
 		this.removeSourceForJsonCompatibility();
diff --git a/openvidu-server/src/main/java/io/openvidu/server/recording/CompositeWrapper.java b/openvidu-server/src/main/java/io/openvidu/server/recording/CompositeWrapper.java
index 61ab8943..2109cccb 100644
--- a/openvidu-server/src/main/java/io/openvidu/server/recording/CompositeWrapper.java
+++ b/openvidu-server/src/main/java/io/openvidu/server/recording/CompositeWrapper.java
@@ -70,7 +70,7 @@ public class CompositeWrapper {
 		this.recorderEndpoint.addRecordingListener(new EventListener<RecordingEvent>() {
 			@Override
 			public void onEvent(RecordingEvent event) {
-				startTime = System.currentTimeMillis();
+				startTime = Long.parseLong(event.getTimestampMillis());
 				log.info("Recording started event for audio-only RecorderEndpoint of Composite in session {}",
 						session.getSessionId());
 				startLatch.countDown();
@@ -92,7 +92,7 @@ public class CompositeWrapper {
 			this.recorderEndpoint.addStoppedListener(new EventListener<StoppedEvent>() {
 				@Override
 				public void onEvent(StoppedEvent event) {
-					endTime = System.currentTimeMillis();
+					endTime = Long.parseLong(event.getTimestampMillis());
 					log.info("Recording stopped event for audio-only RecorderEndpoint of Composite in session {}",
 							session.getSessionId());
 					recorderEndpoint.release();
diff --git a/openvidu-server/src/main/java/io/openvidu/server/recording/service/SingleStreamRecordingService.java b/openvidu-server/src/main/java/io/openvidu/server/recording/service/SingleStreamRecordingService.java
index 605065c0..3b7a6887 100644
--- a/openvidu-server/src/main/java/io/openvidu/server/recording/service/SingleStreamRecordingService.java
+++ b/openvidu-server/src/main/java/io/openvidu/server/recording/service/SingleStreamRecordingService.java
@@ -199,7 +199,7 @@ public class SingleStreamRecordingService extends RecordingService {
 			@Override
 			public void onEvent(RecordingEvent event) {
 				recorders.get(session.getSessionId()).get(participant.getPublisherStreamId())
-						.setStartTime(System.currentTimeMillis());
+						.setStartTime(Long.parseLong(event.getTimestampMillis()));
 				log.info("Recording started event for stream {}", participant.getPublisherStreamId());
 				globalStartLatch.countDown();
 			}
@@ -232,7 +232,7 @@ public class SingleStreamRecordingService extends RecordingService {
 			finalWrapper.getRecorder().addStoppedListener(new EventListener<StoppedEvent>() {
 				@Override
 				public void onEvent(StoppedEvent event) {
-					finalWrapper.setEndTime(System.currentTimeMillis());
+					finalWrapper.setEndTime(Long.parseLong(event.getTimestampMillis()));
 					generateIndividualMetadataFile(finalWrapper);
 					log.info("Recording stopped event for stream {}", streamId);
 					finalWrapper.getRecorder().release();