diff --git a/app/Http/Controllers/ControlMessageController.php b/app/Http/Controllers/ControlMessageController.php
index 060b635..f158655 100644
--- a/app/Http/Controllers/ControlMessageController.php
+++ b/app/Http/Controllers/ControlMessageController.php
@@ -154,7 +154,14 @@ protected function resolveConnectionMessage($connectionInfo, $user)
     {
         $deferred = new Deferred();
 
-        $connectionMessageResolver = config('expose-server.messages.resolve_connection_message')($connectionInfo, $user);
+        $resolveConnectionMessage = config('expose-server.messages.resolve_connection_message');
+        if(is_string($resolveConnectionMessage) && class_exists($resolveConnectionMessage)) {
+            $connectionMessageResolver = (new $resolveConnectionMessage())($connectionInfo, $user);
+        } else if($resolveConnectionMessage instanceof \Closure) {
+            $connectionMessageResolver = $resolveConnectionMessage($connectionInfo, $user);
+        } else {
+            $connectionMessageResolver = $resolveConnectionMessage;
+        }
 
         if ($connectionMessageResolver instanceof PromiseInterface) {
             $connectionMessageResolver->then(function ($connectionMessage) use ($connectionInfo, $deferred) {
diff --git a/app/Support/Messages/ResolveConnectionMessage.php b/app/Support/Messages/ResolveConnectionMessage.php
new file mode 100644
index 0000000..f4b6067
--- /dev/null
+++ b/app/Support/Messages/ResolveConnectionMessage.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Expose\Server\Support\Messages;
+
+use Expose\Server\Connections\ControlConnection;
+
+class ResolveConnectionMessage
+{
+    public function __invoke(ControlConnection $connectionInfo, array|null $user)
+    {
+        return config('expose-server.messages.message_of_the_day');
+    }
+}
diff --git a/config/expose-server.php b/config/expose-server.php
index 3d36320..6786983 100644
--- a/config/expose-server.php
+++ b/config/expose-server.php
@@ -165,9 +165,7 @@
     |
     */
     'messages' => [
-        'resolve_connection_message' => function ($connectionInfo, $user) {
-            return config('expose-server.messages.message_of_the_day');
-        },
+        'resolve_connection_message' => \Expose\Server\Support\Messages\ResolveConnectionMessage::class,
 
         'message_of_the_day' => 'Thank you for using expose.',