diff --git a/src/Forms/Tags.php b/src/Forms/Tags.php
index 7e0e8b6e125..8bb3c647a1c 100644
--- a/src/Forms/Tags.php
+++ b/src/Forms/Tags.php
@@ -389,7 +389,7 @@ protected function parseJsParamDriverAndOptions($value, $form)
      */
     protected function addToDebugBar($data, $formHandle)
     {
-        if (! function_exists('debugbar') || ! class_exists(ConfigCollector::class)) {
+        if (! function_exists('debugbar') || ! debugbar()->isEnabled() || ! class_exists(ConfigCollector::class)) {
             return;
         }
 
diff --git a/src/helpers.php b/src/helpers.php
index 9df5fe739f4..7e588243053 100644
--- a/src/helpers.php
+++ b/src/helpers.php
@@ -1,6 +1,5 @@
 <?php
 
-use Barryvdh\Debugbar\LaravelDebugbar;
 use Statamic\Facades\Path;
 use Statamic\Statamic;
 
@@ -17,6 +16,6 @@ function statamic_path($path = null)
 if (! function_exists('debugbar')) {
     function debugbar()
     {
-        return app()->bound(LaravelDebugbar::class) ? app(LaravelDebugbar::class) : optional();
+        return app()->bound('debugbar') ? app('debugbar') : optional();
     }
 }