diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 35da159a..3c5c8377 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -5,7 +5,6 @@ namespace App\Providers;
 use App\Tag;
 use App\Note;
 use Validator;
-use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\ServiceProvider;
 
 class AppServiceProvider extends ServiceProvider
@@ -46,14 +45,6 @@ class AppServiceProvider extends ServiceProvider
                 $note->tags()->attach($tagsToAdd);
             }
         });
-
-        //allow micropub use in development
-        if (env('APP_DEBUG') == true || env('APP_ENV') == 'testing') {
-            session(['me' => env('APP_URL')]);
-            if (Storage::exists('dev-token')) {
-                session(['token' => Storage::get('dev-token')]);
-            }
-        }
     }
 
     /**
diff --git a/app/Providers/MicropubSessionProvider.php b/app/Providers/MicropubSessionProvider.php
new file mode 100644
index 00000000..0b9bf9ac
--- /dev/null
+++ b/app/Providers/MicropubSessionProvider.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Providers;
+
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\ServiceProvider;
+
+class MicropubSessionProvider extends ServiceProvider
+{
+    /**
+     * Bootstrap the application services.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+        //allow micropub use in development
+        if (env('APP_DEBUG') == true) {
+            session(['me' => env('APP_URL')]);
+            if (Storage::exists('dev-token')) {
+                session(['token' => Storage::get('dev-token')]);
+            }
+        }
+    }
+
+    /**
+     * Register the application services.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        //
+    }
+}
diff --git a/config/app.php b/config/app.php
index ee0e5969..850c268f 100644
--- a/config/app.php
+++ b/config/app.php
@@ -182,6 +182,7 @@ return [
         // App\Providers\BroadcastServiceProvider::class,
         App\Providers\EventServiceProvider::class,
         App\Providers\RouteServiceProvider::class,
+        App\Providers\MicropubSessionProvider::class,
 
         /*
          * Laravel Debugbar