diff --git a/libkbfs/folder_branch_ops.go b/libkbfs/folder_branch_ops.go
index <HASH>..<HASH> 100644
--- a/libkbfs/folder_branch_ops.go
+++ b/libkbfs/folder_branch_ops.go
@@ -6084,6 +6084,13 @@ func (fbo *folderBranchOps) SyncFromServer(ctx context.Context,
 		return err
 	}
 
+	services, _ := fbo.serviceStatus.CurrentStatus()
+	if len(services) > 0 {
+		fbo.log.CDebugf(ctx, "Not fetching new updates while offline; "+
+			"failing services=%v", services)
+		return nil
+	}
+
 	// Loop until we're fully updated on the master branch.
 	for {
 		if fbo.isUnmerged(lState) {
folder_branch_ops: ignore SyncFromServer read calls while offline

Offline tests shouldn't fail because they can't read MDs from the
server, or update their kbfsedit messages.

Issue: KBFS-<I>