diff --git a/Server/src/command_helper.rs b/Server/src/command_helper.rs
index 21d4084..f074ccb 100644
--- a/Server/src/command_helper.rs
+++ b/Server/src/command_helper.rs
@@ -4,7 +4,6 @@ pub(crate) fn run() {
     let stdin = std::io::stdin();
 
     loop {
-        print!("> ");
         std::io::stdout()
             .flush()
             .expect("Failed to flush standard output!");
diff --git a/Server/src/grpc_server.rs b/Server/src/grpc_server.rs
index bca2cbb..20b983e 100644
--- a/Server/src/grpc_server.rs
+++ b/Server/src/grpc_server.rs
@@ -1,5 +1,6 @@
 use std::net::SocketAddr;
 
+use tokio::task;
 use tonic::transport::Server;
 use tonic_web::GrpcWebLayer;
 
@@ -17,13 +18,15 @@ impl GrpcServer {
         let general_service = GeneralServiceServer::new(GeneralServiceImpl);
         let game_service = GameServiceServer::new(GameServiceImpl);
 
-        Server::builder()
-            .accept_http1(true)
-            .layer(GrpcWebLayer::new())
-            .add_service(general_service)
-            .add_service(game_service)
-            .serve(addr)
-            .await
-            .unwrap_or_else(|e| log::error!("Failed to build server: {e}"));
+        task::spawn(async move {
+            Server::builder()
+                .accept_http1(true)
+                .layer(GrpcWebLayer::new())
+                .add_service(general_service)
+                .add_service(game_service)
+                .serve(addr)
+                .await
+                .unwrap_or_else(|e| log::error!("Failed to build server: {e}"));
+        });
     }
 }