diff --git a/server/src/channel/ClientChannelView.h b/server/src/channel/ClientChannelView.h
index fdc0f84..ea951bd 100644
--- a/server/src/channel/ClientChannelView.h
+++ b/server/src/channel/ClientChannelView.h
@@ -32,7 +32,6 @@ namespace ts {
 		    ChannelId cached_parent_id = 0;
     };
 
-    typedef std::shared_lock<std::shared_recursive_mutex> TreeLock;
     class ClientChannelView : private TreeView {
         public:
     		enum ChannelAction {
diff --git a/server/src/client/query/QueryClient.h b/server/src/client/query/QueryClient.h
index d215232..d430c7c 100644
--- a/server/src/client/query/QueryClient.h
+++ b/server/src/client/query/QueryClient.h
@@ -38,8 +38,6 @@ namespace ts {
 		        bool ignoresFlood() override;
 
 		        inline std::shared_ptr<QueryAccount> getQueryAccount() { return this->query_account; }
-
-		        std::shared_recursive_mutex server_lock;
 	        protected:
                 void preInitialize();
                 void postInitialize();
diff --git a/server/src/client/query/QueryClientCommands.cpp b/server/src/client/query/QueryClientCommands.cpp
index cc661b4..14019e4 100644
--- a/server/src/client/query/QueryClientCommands.cpp
+++ b/server/src/client/query/QueryClientCommands.cpp
@@ -318,7 +318,8 @@ CommandResult QueryClient::handleCommandServerSelect(Command &cmd) {
 
     //register at current server
 	{
-		unique_lock server_lock(this->server_lock);
+		//unique_lock server_lock(this->server_lock);
+		/* We dont need to lock the server because only one command can be executed at the time. Everything else should copy the server once and test the copy and use that ref then */
 		this->server = target;
 	}
 
diff --git a/shared b/shared
index 6ee207a..9833dab 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit 6ee207aaadeb9a57a9e1fc4fd19ebeb1be81f1fd
+Subproject commit 9833dab6e4f96c045da632c208aa1bc977d45349