diff --git a/app/src/main/java/io/heckel/ntfy/ui/DetailActivity.kt b/app/src/main/java/io/heckel/ntfy/ui/DetailActivity.kt
index 2947c5de..ea539100 100644
--- a/app/src/main/java/io/heckel/ntfy/ui/DetailActivity.kt
+++ b/app/src/main/java/io/heckel/ntfy/ui/DetailActivity.kt
@@ -81,7 +81,6 @@ class DetailActivity : AppCompatActivity(), NotificationFragment.NotificationSet
     private var subscriptionBaseUrl: String = "" // Set in onCreate()
     private var subscriptionTopic: String = "" // Set in onCreate()
     private var subscriptionDisplayName: String = "" // Set in onCreate() & updated by options menu!
-    private var subscriptionInstant: Boolean = false // Set in onCreate() & updated by options menu!
     private var subscriptionMutedUntil: Long = 0L // Set in onCreate() & updated by options menu!
 
     // UI elements
@@ -283,7 +282,6 @@ class DetailActivity : AppCompatActivity(), NotificationFragment.NotificationSet
         subscriptionBaseUrl = intent.getStringExtra(MainActivity.EXTRA_SUBSCRIPTION_BASE_URL) ?: return
         subscriptionTopic = intent.getStringExtra(MainActivity.EXTRA_SUBSCRIPTION_TOPIC) ?: return
         subscriptionDisplayName = intent.getStringExtra(MainActivity.EXTRA_SUBSCRIPTION_DISPLAY_NAME) ?: return
-        subscriptionInstant = intent.getBooleanExtra(MainActivity.EXTRA_SUBSCRIPTION_INSTANT, false)
         subscriptionMutedUntil = intent.getLongExtra(MainActivity.EXTRA_SUBSCRIPTION_MUTED_UNTIL, 0L)
 
         // Set title
@@ -539,7 +537,6 @@ class DetailActivity : AppCompatActivity(), NotificationFragment.NotificationSet
         // Update buttons (this is for when we return from the preferences screen)
         lifecycleScope.launch(Dispatchers.IO) {
             val subscription = repository.getSubscription(subscriptionId) ?: return@launch
-            subscriptionInstant = subscription.instant
             subscriptionMutedUntil = subscription.mutedUntil
             subscriptionDisplayName = displayName(appBaseUrl, subscription)
 
diff --git a/app/src/main/java/io/heckel/ntfy/ui/DetailViewModel.kt b/app/src/main/java/io/heckel/ntfy/ui/DetailViewModel.kt
index f9293841..8c9e1d1e 100644
--- a/app/src/main/java/io/heckel/ntfy/ui/DetailViewModel.kt
+++ b/app/src/main/java/io/heckel/ntfy/ui/DetailViewModel.kt
@@ -15,8 +15,6 @@ class DetailViewModel(private val repository: Repository) : ViewModel() {
     private val _searchQuery = MutableLiveData("")
     val searchQuery: LiveData<String> = _searchQuery
 
-    private var currentSubscriptionId: Long = 0
-
     fun setSearchQuery(query: String) {
         _searchQuery.value = query
     }
@@ -26,7 +24,6 @@ class DetailViewModel(private val repository: Repository) : ViewModel() {
     }
 
     fun listFiltered(subscriptionId: Long): LiveData<List<Notification>> {
-        currentSubscriptionId = subscriptionId
         return _searchQuery.switchMap { query ->
             if (query.isNullOrBlank()) {
                 repository.getNotificationsLiveData(subscriptionId)