diff --git a/lib/model/folder.go b/lib/model/folder.go
index 23d3a6897..459373efd 100644
--- a/lib/model/folder.go
+++ b/lib/model/folder.go
@@ -181,6 +181,8 @@ func (f *folder) Serve(ctx context.Context) error {
 	pullTimer := time.NewTimer(0)
 	pullTimer.Stop()
 
+	f.setState(FolderIdle)
+
 	for {
 		var err error
 
diff --git a/lib/model/model_test.go b/lib/model/model_test.go
index e132f08ec..e9434297e 100644
--- a/lib/model/model_test.go
+++ b/lib/model/model_test.go
@@ -1667,8 +1667,6 @@ func waitForState(t *testing.T, sub events.Subscription, folder, expected string
 				}
 				if err == expected {
 					return
-				} else {
-					t.Error(ev)
 				}
 			}
 		case <-timeout: