diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SplashActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SplashActivity.kt
index 9b531a20b..1fdfc4346 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SplashActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SplashActivity.kt
@@ -5,6 +5,7 @@ import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
 import com.simplemobiletools.calendar.helpers.DAY_CODE
 import com.simplemobiletools.calendar.helpers.EVENT_ID
+import com.simplemobiletools.calendar.helpers.EVENT_OCCURRENCE_TS
 
 class SplashActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -18,6 +19,7 @@ class SplashActivity : AppCompatActivity() {
         } else if (intent.extras?.containsKey(EVENT_ID) == true) {
             Intent(this, EventActivity::class.java).apply {
                 putExtra(EVENT_ID, intent.getIntExtra(EVENT_ID, 0))
+                putExtra(EVENT_OCCURRENCE_TS, intent.getIntExtra(EVENT_OCCURRENCE_TS, 0))
                 startActivity(this)
             }
         } else {
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/EventListWidgetAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/EventListWidgetAdapter.kt
index f0533c93b..1fa69ae9f 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/EventListWidgetAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/EventListWidgetAdapter.kt
@@ -11,6 +11,7 @@ import com.simplemobiletools.calendar.extensions.config
 import com.simplemobiletools.calendar.extensions.dbHelper
 import com.simplemobiletools.calendar.extensions.seconds
 import com.simplemobiletools.calendar.helpers.EVENT_ID
+import com.simplemobiletools.calendar.helpers.EVENT_OCCURRENCE_TS
 import com.simplemobiletools.calendar.helpers.Formatter
 import com.simplemobiletools.calendar.models.ListEvent
 import com.simplemobiletools.calendar.models.ListItem
@@ -65,6 +66,7 @@ class EventListWidgetAdapter(val context: Context, val intent: Intent) : RemoteV
 
                 Intent().apply {
                     putExtra(EVENT_ID, item.id)
+                    putExtra(EVENT_OCCURRENCE_TS, item.startTS)
                     setOnClickFillInIntent(event_item_holder, this)
                 }
             }
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt
index 7f583ad4f..c724f895f 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt
@@ -107,8 +107,8 @@ fun Context.cancelNotification(id: Int) {
 
 private fun getNotificationIntent(context: Context, event: Event): PendingIntent {
     val intent = Intent(context, NotificationReceiver::class.java)
-    intent.putExtra(EVENT_OCCURRENCE_TS, event.startTS)
     intent.putExtra(EVENT_ID, event.id)
+    intent.putExtra(EVENT_OCCURRENCE_TS, event.startTS)
     return PendingIntent.getBroadcast(context, event.id, intent, PendingIntent.FLAG_UPDATE_CURRENT)
 }
 
@@ -203,15 +203,15 @@ private fun getFormattedEventTime(startTime: String, endTime: String) = if (star
 
 private fun getPendingIntent(context: Context, event: Event): PendingIntent {
     val intent = Intent(context, EventActivity::class.java)
-    intent.putExtra(EVENT_OCCURRENCE_TS, event.startTS)
     intent.putExtra(EVENT_ID, event.id)
+    intent.putExtra(EVENT_OCCURRENCE_TS, event.startTS)
     return PendingIntent.getActivity(context, event.id, intent, PendingIntent.FLAG_UPDATE_CURRENT)
 }
 
 private fun getSnoozePendingIntent(context: Context, event: Event): PendingIntent {
     val intent = Intent(context, SnoozeService::class.java).setAction("snooze")
-    intent.putExtra(EVENT_OCCURRENCE_TS, event.startTS)
     intent.putExtra(EVENT_ID, event.id)
+    intent.putExtra(EVENT_OCCURRENCE_TS, event.startTS)
     return PendingIntent.getService(context, event.id, intent, PendingIntent.FLAG_UPDATE_CURRENT)
 }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragment.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragment.kt
index 04587ec3c..1d929bc8d 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragment.kt
@@ -141,8 +141,8 @@ class DayFragment : Fragment(), DBHelper.EventUpdateListener, DeleteEventsListen
 
     private fun editEvent(event: Event) {
         Intent(activity.applicationContext, EventActivity::class.java).apply {
-            putExtra(EVENT_OCCURRENCE_TS, event.startTS)
             putExtra(EVENT_ID, event.id)
+            putExtra(EVENT_OCCURRENCE_TS, event.startTS)
             startActivity(this)
         }
     }
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/EventListFragment.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/EventListFragment.kt
index 1437024dc..af2522b51 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/EventListFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/EventListFragment.kt
@@ -103,8 +103,8 @@ class EventListFragment : Fragment(), DBHelper.EventUpdateListener, DeleteEvents
 
     private fun editEvent(event: ListEvent) {
         Intent(activity.applicationContext, EventActivity::class.java).apply {
-            putExtra(EVENT_OCCURRENCE_TS, event.startTS)
             putExtra(EVENT_ID, event.id)
+            putExtra(EVENT_OCCURRENCE_TS, event.startTS)
             startActivity(this)
         }
     }
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/WeekFragment.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/WeekFragment.kt
index 9414421cf..d86c406db 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/WeekFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/WeekFragment.kt
@@ -269,8 +269,8 @@ class WeekFragment : Fragment(), WeeklyCalendar {
                     }
                     setOnClickListener {
                         Intent(activity.applicationContext, EventActivity::class.java).apply {
-                            putExtra(EVENT_OCCURRENCE_TS, event.startTS)
                             putExtra(EVENT_ID, event.id)
+                            putExtra(EVENT_OCCURRENCE_TS, event.startTS)
                             startActivity(this)
                         }
                     }