diff --git a/res/values/non_localizable_custom.xml b/res/values/non_localizable_custom.xml
index bec3e38b4..d42ef16b1 100644
--- a/res/values/non_localizable_custom.xml
+++ b/res/values/non_localizable_custom.xml
@@ -16,6 +16,7 @@
 	<bool name="show_full_remote_address_on_incoming_call">true</bool>
 	<bool name="show_only_username_in_history">false</bool>
 
+	<bool name="allow_ringing_while_early_media">true</bool>
 	<bool name="allow_transfers">true</bool>
 
 	<bool name="allow_edit_in_dialer">true</bool>
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 55f87d596..e8f13c59e 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -966,7 +966,7 @@ public final class LinphoneManager implements LinphoneCoreListener {
 			} 
 		}
 
-		if (state == IncomingReceived) {
+		if (state == IncomingReceived || (state == state.CallIncomingEarlyMedia && mR.getBoolean(R.bool.allow_ringing_while_early_media))) {
 			// Brighten screen for at least 10 seconds
 			WakeLock wl = mPowerManager.newWakeLock(
 					PowerManager.ACQUIRE_CAUSES_WAKEUP