diff --git a/app/Http/Controllers/DebugController.php b/app/Http/Controllers/DebugController.php
index 17c82116d7..996a64a594 100644
--- a/app/Http/Controllers/DebugController.php
+++ b/app/Http/Controllers/DebugController.php
@@ -130,7 +130,6 @@ class DebugController extends Controller
         $toSandbox      = var_export(config('firefly.bunq_use_sandbox'), true);
         $trustedProxies = config('firefly.trusted_proxies');
         $displayErrors  = ini_get('display_errors');
-        $storageDisks   = implode(', ', config('filesystems.disks.upload.disks'));
         $errorReporting = $this->errorReporting((int)ini_get('error_reporting'));
         $appEnv         = config('app.env');
         $appDebug       = var_export(config('app.debug'), true);
@@ -175,12 +174,9 @@ class DebugController extends Controller
 
         return view(
             'debug', compact(
-                       'phpVersion', 'extensions', 'localeAttempts', 'appEnv', 'appDebug', 'logChannel', 'appLogLevel', 'now', 'drivers',
-                       'currentDriver', 'loginProvider', 'storageDisks',
-                       'userAgent', 'displayErrors', 'errorReporting', 'phpOs', 'interface', 'logContent', 'cacheDriver', 'isSandstorm',
-                       'trustedProxies',
-                       'toSandbox'
-                   )
+            'phpVersion', 'extensions', 'localeAttempts', 'appEnv', 'appDebug', 'logChannel', 'appLogLevel', 'now', 'drivers', 'currentDriver', 'loginProvider',
+            'userAgent', 'displayErrors', 'errorReporting', 'phpOs', 'interface', 'logContent', 'cacheDriver', 'isSandstorm', 'trustedProxies', 'toSandbox'
+        )
         );
     }
 
diff --git a/app/Http/Controllers/Export/IndexController.php b/app/Http/Controllers/Export/IndexController.php
index ae3a4f85e1..9cf68ca593 100644
--- a/app/Http/Controllers/Export/IndexController.php
+++ b/app/Http/Controllers/Export/IndexController.php
@@ -24,6 +24,7 @@ namespace FireflyIII\Http\Controllers\Export;
 
 use Carbon\Carbon;
 use FireflyIII\Http\Controllers\Controller;
+use FireflyIII\Http\Middleware\IsDemoUser;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Support\Export\ExportDataGenerator;
 use Illuminate\Http\Response as LaravelResponse;
@@ -52,6 +53,7 @@ class IndexController extends Controller
                 app('view')->share('mainTitleIcon', 'fa-life-bouy');
                 app('view')->share('title', (string)trans('firefly.export_data_title'));
                 $this->journalRepository = app(JournalRepositoryInterface::class);
+                $this->middleware(IsDemoUser::class)->except(['index']);
 
                 return $next($request);
             }
@@ -59,9 +61,10 @@ class IndexController extends Controller
     }
 
     /**
-     *
+     * @return LaravelResponse
+     * @throws \League\Csv\CannotInsertRecord
      */
-    public function export()
+    public function export(): LaravelResponse
     {
         /** @var ExportDataGenerator $generator */
         $generator = app(ExportDataGenerator::class);
@@ -94,15 +97,12 @@ class IndexController extends Controller
             ->header('Cache-Control', 'must-revalidate, post-check=0, pre-check=0')
             ->header('Pragma', 'public')
             ->header('Content-Length', strlen($result['transactions']));
-
-        return $response;
-
         // return CSV file made from 'transactions' array.
-        return $result['transactions'];
+        return $response;
     }
 
     /**
-     *
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
     public function index()
     {
diff --git a/resources/views/v1/debug.twig b/resources/views/v1/debug.twig
index d1162d4827..fec9827c6e 100644
--- a/resources/views/v1/debug.twig
+++ b/resources/views/v1/debug.twig
@@ -38,7 +38,6 @@ Debug information generated at {{ now }} for Firefly III version **{{ FF_VERSION
 | DB drivers | {{ drivers }} |
 | Current driver | {{ currentDriver }} |
 | Login provider | {{ loginProvider }}  |
-| Storage disks | {{ storageDisks }}  |
 | Using Sandstorm? | {% if SANDSTORM == true %}yes{% else %}no{% endif %} |
 {% if SANDSTORM == true %}| Sandstorm anon? | {% if SANDSTORM_ANON == true %}yes{% else %}no{% endif %} |{% endif %}
 | Is Sandstorm (.env) | {{ isSandstorm }} |