diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php
index a7d9a76..ba10c28 100644
--- a/resources/views/dashboard.blade.php
+++ b/resources/views/dashboard.blade.php
@@ -347,14 +347,14 @@
                 name: '# Peak Connections'
               },
               {
-                x: data.websocket_message_count.x,
-                y: data.websocket_message_count.y,
+                x: data.websocket_messages_count.x,
+                y: data.websocket_messages_count.y,
                 type: 'bar',
                 name: '# Websocket Messages'
               },
               {
-                x: data.api_message_count.x,
-                y: data.api_message_count.y,
+                x: data.api_messages_count.x,
+                y: data.api_messages_count.y,
                 type: 'bar',
                 name: '# API Messages'
               },
diff --git a/src/Console/Commands/StartServer.php b/src/Console/Commands/StartServer.php
index 1a03aaa..c67426b 100644
--- a/src/Console/Commands/StartServer.php
+++ b/src/Console/Commands/StartServer.php
@@ -128,12 +128,6 @@ class StartServer extends Command
             return new $class;
         });
 
-        $this->laravel->singleton(StatisticsStore::class, function () {
-            $class = config('websockets.statistics.store');
-
-            return new $class;
-        });
-
         if (! $this->option('disable-statistics')) {
             $intervalInSeconds = $this->option('statistics-interval') ?: config('websockets.statistics.interval_in_seconds', 3600);
 
diff --git a/src/WebSocketsServiceProvider.php b/src/WebSocketsServiceProvider.php
index a3e44cc..5498184 100644
--- a/src/WebSocketsServiceProvider.php
+++ b/src/WebSocketsServiceProvider.php
@@ -2,6 +2,7 @@
 
 namespace BeyondCode\LaravelWebSockets;
 
+use BeyondCode\LaravelWebSockets\Contracts\StatisticsStore;
 use BeyondCode\LaravelWebSockets\Dashboard\Http\Controllers\AuthenticateDashboard;
 use BeyondCode\LaravelWebSockets\Dashboard\Http\Controllers\SendMessage;
 use BeyondCode\LaravelWebSockets\Dashboard\Http\Controllers\ShowDashboard;
@@ -34,6 +35,8 @@ class WebSocketsServiceProvider extends ServiceProvider
             __DIR__.'/../database/migrations/0000_00_00_000000_rename_statistics_counters.php' => database_path('migrations/0000_00_00_000000_rename_statistics_counters.php'),
         ], 'migrations');
 
+        $this->registerStatistics();
+
         $this->registerDashboard();
 
         $this->registerCommands();
@@ -50,6 +53,20 @@ class WebSocketsServiceProvider extends ServiceProvider
         $this->registerManagers();
     }
 
+    /**
+     * Register the statistics-related contracts.
+     *
+     * @return void
+     */
+    protected function registerStatistics()
+    {
+        $this->app->singleton(StatisticsStore::class, function () {
+            $class = config('websockets.statistics.store');
+
+            return new $class;
+        });
+    }
+
     /**
      * Regsiter the dashboard components.
      *