diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 36e1aa2b854158763787344c87d81261abff361f..197263f920484921a0743d5ac36e4dfd708fbd50 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -28,6 +28,7 @@
     <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
     <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT"/>
     <uses-permission android:name="com.samsung.android.iap.permission.BILLING"/>
+    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
 
     <!-- required dangerous permissions -->
     <uses-permission android:name="android.permission.CAMERA"/>
diff --git a/app/src/main/java/com/nynja/mobile/communicator/ui/activities/MainActivity.java b/app/src/main/java/com/nynja/mobile/communicator/ui/activities/MainActivity.java
index 62c3d104e670113399d7b9cdb05cfd98ae390742..c506fcf04be603e0b05dc68083cc983d8b98e7b5 100644
--- a/app/src/main/java/com/nynja/mobile/communicator/ui/activities/MainActivity.java
+++ b/app/src/main/java/com/nynja/mobile/communicator/ui/activities/MainActivity.java
@@ -15,6 +15,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Parcelable;
 import android.os.PowerManager;
+import android.provider.Settings;
 import android.support.annotation.ColorRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -216,7 +217,6 @@ public class MainActivity extends BaseActivity implements MainActivityView,
         } catch (Exception ex) {
             Timber.e(ex);
         }
-        mPresenter.loadPickupCalls();
     }
 
     @Override
@@ -239,7 +239,9 @@ public class MainActivity extends BaseActivity implements MainActivityView,
     @Override
     protected void onStart() {
         super.onStart();
+        mPresenter.loadPickupCalls();
         requestStoragePermissions();
+//        igroreBateryOptimization();
     }
 
     @Override
@@ -268,6 +270,21 @@ public class MainActivity extends BaseActivity implements MainActivityView,
         }
     }
 
+    private void igroreBateryOptimization() {
+        if (Build.VERSION.SDK_INT>Build.VERSION_CODES.LOLLIPOP_MR1) {
+            String pkg=getPackageName();
+            PowerManager pm=getSystemService(PowerManager.class);
+
+            if (!pm.isIgnoringBatteryOptimizations(pkg)) {
+                Intent i=
+                        new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS)
+                                .setData(Uri.parse("package:"+pkg));
+
+                startActivity(i);
+            }
+        }
+    }
+
     private void requestStoragePermissions() {
         addDisposable(mRxPermissions.requestEachCombined(Manifest.permission.WRITE_EXTERNAL_STORAGE,
                 Manifest.permission.READ_EXTERNAL_STORAGE)