diff --git a/src/android/org/linphone/activities/LinphoneActivity.java b/src/android/org/linphone/activities/LinphoneActivity.java
index 89baf5af4..63dd03275 100644
--- a/src/android/org/linphone/activities/LinphoneActivity.java
+++ b/src/android/org/linphone/activities/LinphoneActivity.java
@@ -293,12 +293,11 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
                 break;
         }
 
+        mAlwaysChangingPhoneAngle = rotation;
         if (LinphoneManager.isInstanciated()) {
             LinphoneManager.getLc().setDeviceRotation(rotation);
+            onNewIntent(getIntent());
         }
-        mAlwaysChangingPhoneAngle = rotation;
-
-        onNewIntent(getIntent());
     }
 
     private void initButtons() {
diff --git a/src/android/org/linphone/activities/LinphoneGenericActivity.java b/src/android/org/linphone/activities/LinphoneGenericActivity.java
index a059fae40..e55625741 100644
--- a/src/android/org/linphone/activities/LinphoneGenericActivity.java
+++ b/src/android/org/linphone/activities/LinphoneGenericActivity.java
@@ -34,12 +34,7 @@ public class LinphoneGenericActivity extends Activity {
         /*After a crash, Android restart the last Activity so we need to check
          * if all dependencies are load
          */
-        if (!LinphoneService.isReady()) {
-            finish();
-            startService(getIntent().setClass(this, LinphoneService.class));
-            return;
-        }
-        if (!LinphoneManager.isInstanciated()) {
+        if (!LinphoneService.isReady() || !LinphoneManager.isInstanciated()) {
             finish();
             startActivity(getIntent().setClass(this, LinphoneLauncherActivity.class));
             return;