diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
index 2c5aaab9d..bd3816542 100644
--- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
@@ -256,8 +256,6 @@ class ChatActivity :
     lateinit var chatViewModel: ChatViewModel
     lateinit var messageInputViewModel: MessageInputViewModel
 
-    private lateinit var noteToSelfRoomToken: String
-
     private val startSelectContactForResult = registerForActivityResult(
         ActivityResultContracts
             .StartActivityForResult()
@@ -642,27 +640,6 @@ class ChatActivity :
             }
         }
 
-        chatViewModel.noteToSelfViewState.observe(this) { state ->
-
-            when (state) {
-                is ChatViewModel.NoteToSelfErrorState -> {
-                    Snackbar.make(binding.root, "Unable to send message to note to self", Snackbar.LENGTH_LONG).show()
-                }
-                ChatViewModel.NoteToSelfStartState -> {
-                }
-                is ChatViewModel.NoteToSelfSuccessState -> {
-                    val roomOverall = state.roomOverall
-                    noteToSelfRoomToken = roomOverall.ocs?.data?.token!!
-                }
-
-                is ChatViewModel.NoteToSelfNotAvailableState -> {
-                }
-
-                else -> {
-                }
-            }
-        }
-
         chatViewModel.joinRoomViewState.observe(this) { state ->
             when (state) {
                 is ChatViewModel.JoinRoomSuccessState -> {
diff --git a/app/src/main/java/com/nextcloud/talk/chat/viewmodels/ChatViewModel.kt b/app/src/main/java/com/nextcloud/talk/chat/viewmodels/ChatViewModel.kt
index 126e8f38b..c24eceeae 100644
--- a/app/src/main/java/com/nextcloud/talk/chat/viewmodels/ChatViewModel.kt
+++ b/app/src/main/java/com/nextcloud/talk/chat/viewmodels/ChatViewModel.kt
@@ -557,7 +557,7 @@ class ChatViewModel @Inject constructor(
                 }
 
                 override fun onError(e: Throwable) {
-                    Log.e(TAG, "Error when sharing location to notes $e")
+                    Log.e(TAG, "Error when getting note to self room $e")
                     _noteToSelfViewState.value = NoteToSelfErrorState(e.localizedMessage ?: "")
                 }
 
diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/MessageActionsDialog.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/MessageActionsDialog.kt
index db4eac85f..385b45367 100644
--- a/app/src/main/java/com/nextcloud/talk/ui/dialog/MessageActionsDialog.kt
+++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/MessageActionsDialog.kt
@@ -192,9 +192,6 @@ class MessageActionsDialog(
                     noteToSelfRoomToken = roomOverall.ocs?.data?.token!!
                 }
 
-                is ChatViewModel.NoteToSelfNotAvailableState -> {
-                }
-
                 else -> {
                 }
             }