diff --git a/app/src/main/java/com/github/steroidteam/todolist/database/FileStorageDatabase.java b/app/src/main/java/com/github/steroidteam/todolist/database/FileStorageDatabase.java
index 9aa1dea7..4973d59a 100644
--- a/app/src/main/java/com/github/steroidteam/todolist/database/FileStorageDatabase.java
+++ b/app/src/main/java/com/github/steroidteam/todolist/database/FileStorageDatabase.java
@@ -434,7 +434,7 @@ public CompletableFuture<UUID> putTagInList(UUID todoListID, UUID tagId) {
                 .thenApply(JSONSerializer::serializeTodoList)
                 .thenApply(
                         serializedTodoList -> serializedTodoList.getBytes(StandardCharsets.UTF_8))
-                .thenCompose(bytes -> this.storageService.upload(bytes, listPath))
+                .thenCompose(bytes -> storageService.upload(bytes, listPath))
                 .thenApply(str -> tagId);
     }
 
diff --git a/app/src/main/java/com/github/steroidteam/todolist/database/TodoListRepository.java b/app/src/main/java/com/github/steroidteam/todolist/database/TodoListRepository.java
index 849faec6..b828d7e4 100644
--- a/app/src/main/java/com/github/steroidteam/todolist/database/TodoListRepository.java
+++ b/app/src/main/java/com/github/steroidteam/todolist/database/TodoListRepository.java
@@ -246,11 +246,6 @@ public LiveData<List<Tag>> getGlobalTags() {
         return globalTags;
     }
 
-    public LiveData<List<Tag>> getUnlinkedTags(UUID todoListID) {
-        setTagsLists(todoListID);
-        return unlinkedTags;
-    }
-
     public void putTagInTodolist(UUID todoListID, UUID tagId) {
         localDatabase
                 .putTagInList(todoListID, tagId)
@@ -262,9 +257,10 @@ public void putTagInTodolist(UUID todoListID, UUID tagId) {
                 .thenAccept(
                         str -> {
                             List<Tag> unlinked = globalTags.getValue();
-                            unlinked.removeAll(globalTags.getValue());
+                            unlinked.removeAll(localTags.getValue());
                             unlinkedTags.postValue(unlinked);
                         });
+        remoteDatabase.putTagInList(todoListID, tagId);
     }
 
     public void putTag(Tag tag) {
@@ -293,7 +289,7 @@ public void removeTagFromTodolist(UUID todoListID, UUID tagId) {
                 .thenAccept(
                         str -> {
                             List<Tag> unlinked = globalTags.getValue();
-                            unlinked.removeAll(globalTags.getValue());
+                            unlinked.removeAll(localTags.getValue());
                             unlinkedTags.postValue(unlinked);
                         });
     }