diff --git a/src/main/java/org/swiftp/FTPServerService.java b/src/main/java/org/swiftp/FTPServerService.java
index 3a1bc4444dc3bc0f9e5908cfad83ed56990cf24a..e688392395b0058ff6a973f6d6500585e8d9687f 100644
--- a/src/main/java/org/swiftp/FTPServerService.java
+++ b/src/main/java/org/swiftp/FTPServerService.java
@@ -380,7 +380,7 @@ public abstract class FTPServerService extends Service implements Runnable {
         CharSequence contentText = getString(R.string.notif_text);
         Intent notificationIntent = new Intent(this, getSettingClass());
         PendingIntent contentIntent = PendingIntent.getActivity(this, 0,
-                notificationIntent, 0);
+                notificationIntent, PendingIntent.FLAG_IMMUTABLE);
 
         Notification notification;
         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN) {
diff --git a/src/main/java/org/swiftp/WidgetProvider.java b/src/main/java/org/swiftp/WidgetProvider.java
index db29dbb8c19087175bec5797cbe20b38241042c6..85320488dee7e7697f739bad2bdad433fc1468e4 100644
--- a/src/main/java/org/swiftp/WidgetProvider.java
+++ b/src/main/java/org/swiftp/WidgetProvider.java
@@ -37,7 +37,7 @@ public class WidgetProvider extends AppWidgetProvider {
         active.setAction(ACTION_WIDGET_BUTTON);
 
         PendingIntent actionPendingIntent = PendingIntent.getBroadcast(context, 0,
-                active, 0);
+                active, PendingIntent.FLAG_IMMUTABLE);
         remoteViews.setOnClickPendingIntent(R.id.widget_button_off, actionPendingIntent);
         remoteViews.setOnClickPendingIntent(R.id.widget_button_on, actionPendingIntent);