diff --git a/PdCore/src/main/java/org/puredata/android/service/PdService.java b/PdCore/src/main/java/org/puredata/android/service/PdService.java
index fbab2d03..70236219 100644
--- a/PdCore/src/main/java/org/puredata/android/service/PdService.java
+++ b/PdCore/src/main/java/org/puredata/android/service/PdService.java
@@ -241,8 +241,14 @@ private Notification makeNotification(Intent intent, int icon, String title, Str
 				notificationManager.createNotificationChannel(channel);
 			}
 		}
-
-		PendingIntent pi = PendingIntent.getActivity(getApplicationContext(), 0, intent, 0);
+		
+            	PendingIntent pi = null;
+            	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                	pi = PendingIntent.getActivity(getApplicationContext(), 0, intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
+            	} else {
+                	pi = PendingIntent.getActivity(getApplicationContext(), 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+            	}
+		
 		return new NotificationCompat.Builder(PdService.this, TAG)
 				.setSmallIcon(icon)
 				.setContentTitle(title)