diff --git a/lib/App/Netdisco/Web.pm b/lib/App/Netdisco/Web.pm
index 850a2905..6d761283 100644
--- a/lib/App/Netdisco/Web.pm
+++ b/lib/App/Netdisco/Web.pm
@@ -99,6 +99,27 @@ BEGIN {
     }
     return $self->{path};
   };
+
+  # implement same_site
+  # from https://github.com/PerlDancer/Dancer-Session-Cookie/issues/20
+  *Dancer::Session::Cookie::_cookie_params = sub {
+      my $self     = shift;
+      my $name     = $self->session_name;
+      my $duration = $self->_session_expires_as_duration;
+      my %cookie   = (
+          name      => $name,
+          value     => $self->_cookie_value,
+          path      => setting('session_cookie_path') || '/',
+          domain    => setting('session_domain'),
+          secure    => setting('session_secure'),
+          http_only => setting("session_is_http_only") // 1,
+          same_site => setting("session_same_site"),
+      );
+      if ( defined $duration ) {
+          $cookie{expires} = time + $duration;
+      }
+      return %cookie;
+  };
 }
 
 use App::Netdisco::Web::AuthN;
diff --git a/share/config.yml b/share/config.yml
index 6bfcfaae..e5f1d400 100644
--- a/share/config.yml
+++ b/share/config.yml
@@ -640,6 +640,7 @@ plugins:
         schema_name: 'netdisco'
 session: 'cookie'
 session_cookie_key: 'this_will_be_overridden_on_webapp_startup'
+session_same_site: 'Lax'
 template: 'netdisco_template_toolkit'
 route_cache: true
 appname: 'Netdisco'