diff --git a/bootstrap/helpers/socialite.php b/bootstrap/helpers/socialite.php
index 961f6809b..3b20f2d89 100644
--- a/bootstrap/helpers/socialite.php
+++ b/bootstrap/helpers/socialite.php
@@ -70,8 +70,14 @@ function get_socialite_provider(string $provider)
         'infomaniak' => \SocialiteProviders\Infomaniak\Provider::class,
     ];
 
-    return Socialite::buildProvider(
+    $socialite = Socialite::buildProvider(
         $provider_class_map[$provider],
         $config
     );
+
+    if ($provider == 'gitlab' && !empty($oauth_setting->base_url)) {
+        $socialite->setHost($oauth_setting->base_url);
+    }
+
+    return $socialite;
 }
diff --git a/resources/views/livewire/settings-oauth.blade.php b/resources/views/livewire/settings-oauth.blade.php
index 859c79ce1..6a967504d 100644
--- a/resources/views/livewire/settings-oauth.blade.php
+++ b/resources/views/livewire/settings-oauth.blade.php
@@ -40,7 +40,8 @@
                         @if (
                             $oauth_setting->provider == 'authentik' ||
                                 $oauth_setting->provider == 'clerk' ||
-                                $oauth_setting->provider == 'zitadel')
+                                $oauth_setting->provider == 'zitadel' ||
+                                $oauth_setting->provider == 'gitlab')
                             <x-forms.input id="oauth_settings_map.{{ $oauth_setting->provider }}.base_url"
                                 label="Base URL" />
                         @endif