diff --git a/Changelog.md b/Changelog.md
index fa3ede7e..287a5eb6 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -29,8 +29,7 @@ Changelog [format](http://keepachangelog.com/en/1.0.0/)
     * github.com/urfave/cli v1.22.3 -> v1.22.4
     * golang.org/x/net 20200301022130-244492dfa37a -> 20200707034311-ab3426394381
     * golang.org/x/text v0.3.2 -> v0.3.3
-
-
+* Set first-start to false in bridge, not in frontend.
 
 ### Fixed
 * GODT-454 Fix send on closed channel when receiving unencrypted send confirmation from GUI.
diff --git a/internal/bridge/bridge.go b/internal/bridge/bridge.go
index 0e2932af..9fc63d40 100644
--- a/internal/bridge/bridge.go
+++ b/internal/bridge/bridge.go
@@ -70,6 +70,7 @@ func New(
 
 	if pref.GetBool(preferences.FirstStartKey) {
 		b.SendMetric(metrics.New(metrics.Setup, metrics.FirstStart, metrics.Label(config.GetVersion())))
+		pref.SetBool(preferences.FirstStartKey, false)
 	}
 
 	go b.heartbeat()
diff --git a/internal/bridge/types.go b/internal/bridge/types.go
index 837a5622..1fdd30a2 100644
--- a/internal/bridge/types.go
+++ b/internal/bridge/types.go
@@ -32,6 +32,7 @@ type StoreFactoryConfiger interface {
 type PreferenceProvider interface {
 	Get(key string) string
 	GetBool(key string) bool
+	SetBool(key string, val bool)
 	GetInt(key string) int
 	Set(key string, value string)
 }
diff --git a/internal/frontend/cli/frontend.go b/internal/frontend/cli/frontend.go
index 52e9517b..0df33e7b 100644
--- a/internal/frontend/cli/frontend.go
+++ b/internal/frontend/cli/frontend.go
@@ -21,7 +21,6 @@ package cli
 import (
 	"github.com/ProtonMail/proton-bridge/internal/events"
 	"github.com/ProtonMail/proton-bridge/internal/frontend/types"
-	"github.com/ProtonMail/proton-bridge/internal/preferences"
 	"github.com/ProtonMail/proton-bridge/pkg/config"
 	"github.com/ProtonMail/proton-bridge/pkg/listener"
 
@@ -241,8 +240,6 @@ func (f *frontendCLI) Loop(credentialsError error) error {
 		return credentialsError
 	}
 
-	f.preferences.SetBool(preferences.FirstStartKey, false)
-
 	f.Print(`
             Welcome to ProtonMail Bridge interactive shell
                               ___....___
diff --git a/internal/frontend/qt/frontend.go b/internal/frontend/qt/frontend.go
index 1fa9cede..ff22a8c7 100644
--- a/internal/frontend/qt/frontend.go
+++ b/internal/frontend/qt/frontend.go
@@ -317,8 +317,6 @@ func (s *FrontendQt) qtExecute(Procedure func(*FrontendQt) error) error {
 
 	// Set first start flag.
 	s.Qml.SetIsFirstStart(s.preferences.GetBool(preferences.FirstStartKey))
-	// Don't repeat next start.
-	s.preferences.SetBool(preferences.FirstStartKey, false)
 
 	// Check if it is first start after update (fresh version).
 	lastVersion := s.preferences.Get(preferences.LastVersionKey)