diff --git a/lib/config/folderconfiguration.go b/lib/config/folderconfiguration.go
index b36ca60bd..dc54b8a99 100644
--- a/lib/config/folderconfiguration.go
+++ b/lib/config/folderconfiguration.go
@@ -106,6 +106,9 @@ func (f *FolderConfiguration) HasMarker() bool {
 }
 
 func (f FolderConfiguration) Description() string {
+	if f.Label == "" {
+		return f.ID
+	}
 	return fmt.Sprintf("%q (%s)", f.Label, f.ID)
 }
 
diff --git a/lib/model/model.go b/lib/model/model.go
index 5d3097ff6..80d192752 100644
--- a/lib/model/model.go
+++ b/lib/model/model.go
@@ -184,9 +184,10 @@ func (m *Model) StartDeadlockDetector(timeout time.Duration) {
 func (m *Model) StartFolder(folder string) {
 	m.fmut.Lock()
 	folderType := m.startFolderLocked(folder)
+	folderCfg := m.folderCfgs[folder]
 	m.fmut.Unlock()
 
-	l.Infoln("Ready to synchronize", folder, fmt.Sprintf("(%s)", folderType))
+	l.Infof("Ready to synchronize %s (%s)", folderCfg.Description(), folderType)
 }
 
 func (m *Model) startFolderLocked(folder string) config.FolderType {
diff --git a/lib/protocol/bep_extensions.go b/lib/protocol/bep_extensions.go
index 74ad158ec..1b34a5812 100644
--- a/lib/protocol/bep_extensions.go
+++ b/lib/protocol/bep_extensions.go
@@ -148,5 +148,8 @@ func NewIndexID() IndexID {
 
 func (f Folder) Description() string {
 	// used by logging stuff
+	if f.Label == "" {
+		return f.ID
+	}
 	return fmt.Sprintf("%q (%s)", f.Label, f.ID)
 }