diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNoteMediaController.kt b/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNoteMediaController.kt index 5daeb41fc6..cf426eb759 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNoteMediaController.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNoteMediaController.kt @@ -117,8 +117,10 @@ class VoiceNoteMediaController(val activity: FragmentActivity, private var postp } override fun onDestroy(owner: LifecycleOwner) { - voiceNoteProximityWakeLockManager.unregisterCallbacksAndRelease() - voiceNoteProximityWakeLockManager.unregisterFromLifecycle() + if (this::voiceNoteProximityWakeLockManager.isInitialized) { + voiceNoteProximityWakeLockManager.unregisterCallbacksAndRelease() + voiceNoteProximityWakeLockManager.unregisterFromLifecycle() + } activity.lifecycle.removeObserver(this) super.onDestroy(owner) }