diff --git a/src/main.rs b/src/main.rs
index 2cb571a..a4d8a76 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -136,13 +136,15 @@ use crate::{
         runtime::Runtime,
     },
     groups::{
-        about::{commands::{HelpCommand, TetoCommand}, components::HelpGoBackButton},
+        about::{
+            commands::{HelpCommand, TetoCommand},
+            components::HelpGoBackButton,
+        },
         calls::{
             commands::{
                 CallCommand, FriendRequestCommand, HangupCommand, MaskCommand, SkipCommand,
             },
             events::{CallMessageDeleteHandler, CallMessageEditHandler, CallMessageHandler},
-            tasks::EndInactiveCallsTask,
         },
         gateway::events::{ReadyHandler, ReconnectHandler},
         leveling::{commands::LeaderboardCommand, events::MessageLevelingHandler},
@@ -223,10 +225,10 @@ impl PrefixGetter<State, Extras> for ServerPrefixOrPayphoneMention {
 
         let default_prefixes = vec![DEFAULT_PREFIX.to_string(), mention.clone()];
 
-        if let Some(server_id) = server_id {
-            if let Ok(Some(server)) = Server::get_by_id(server_id, &rt.state.db).await {
-                return vec![server.prefix, mention];
-            }
+        if let Some(server_id) = server_id
+            && let Ok(Some(server)) = Server::get_by_id(server_id, &rt.state.db).await
+        {
+            return vec![server.prefix, mention];
         }
 
         default_prefixes