diff --git a/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoSessionManager.java b/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoSessionManager.java
index 4c12c645..9ece6c9f 100644
--- a/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoSessionManager.java
+++ b/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoSessionManager.java
@@ -1154,10 +1154,10 @@ public class KurentoSessionManager extends SessionManager {
 			location = this.geoLocationByIp.getLocationByIp(ipAddress);
 		} catch (IOException e) {
 			e.printStackTrace();
-			location = new GeoLocation(ipAddress.getHostAddress());
+			location = new GeoLocation(ipAddress != null ? ipAddress.getHostAddress() : null);
 		} catch (Exception e) {
 			log.warn("Error getting address location: {}", e.getMessage());
-			location = new GeoLocation(ipAddress.getHostAddress());
+			location = new GeoLocation(ipAddress != null ? ipAddress.getHostAddress() : null);
 		}
 
 		String rtspConnectionId = kMediaOptions.getTypeOfVideo() + "_" + protocol + "_"
diff --git a/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduTestAppE2eTest.java b/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduTestAppE2eTest.java
index 7d489d8d..4e14486d 100644
--- a/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduTestAppE2eTest.java
+++ b/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduTestAppE2eTest.java
@@ -3431,7 +3431,7 @@ public class OpenViduTestAppE2eTest extends AbstractOpenViduTestAppE2eTest {
 			Assert.assertEquals("Wrong number of properties in event 'sessionCreated'", 3 + 1, event.keySet().size());
 
 			event = CustomWebhook.waitForEvent("participantJoined", 2);
-			Assert.assertEquals("Wrong number of properties in event 'participantJoined'", 9 + 1,
+			Assert.assertEquals("Wrong number of properties in event 'participantJoined'", 10 + 1,
 					event.keySet().size());
 
 			event = CustomWebhook.waitForEvent("webrtcConnectionCreated", 2);