diff --git a/config/dev.exs b/config/dev.exs
index 56ca3a7be..a5e69810c 100644
--- a/config/dev.exs
+++ b/config/dev.exs
@@ -106,4 +106,6 @@ config :nerves_hub, NervesHub.SwooshMailer, adapter: Swoosh.Adapters.Local
 
 config :nerves_hub, NervesHub.RateLimit, limit: 10
 
+config :nerves_hub, NervesHubWeb.DeviceSocketSharedSecretAuth, enabled: true
+
 config :sentry, environment_name: :development
diff --git a/config/runtime.exs b/config/runtime.exs
index efb32d599..6cc22cb93 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -72,8 +72,8 @@ if config_env() == :prod do
       ],
       server: true
 
-    config :nerves_hub, NervesHubWeb.DeviceSocketTokenAuth,
-      enabled: System.get_env("DEVICE_TOKEN_AUTH", "false") == "true"
+    config :nerves_hub, NervesHubWeb.DeviceSocketSharedSecretAuth,
+      enabled: System.get_env("DEVICE_SHARED_SECRET_AUTH", "false") == "true"
   end
 
   if nerves_hub_app in ["all", "device"] do
diff --git a/config/test.exs b/config/test.exs
index 12bfea791..0f8f3fe52 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -81,4 +81,6 @@ config :nerves_hub, NervesHub.SwooshMailer, adapter: Swoosh.Adapters.Test
 
 config :nerves_hub, NervesHub.RateLimit, limit: 100
 
+config :nerves_hub, NervesHubWeb.DeviceSocketSharedSecretAuth, enabled: true
+
 config :sentry, environment_name: :test