diff --git a/ActiveSync/SOGoActiveSyncDispatcher.m b/ActiveSync/SOGoActiveSyncDispatcher.m
index 8becc4adb..e463220eb 100644
--- a/ActiveSync/SOGoActiveSyncDispatcher.m
+++ b/ActiveSync/SOGoActiveSyncDispatcher.m
@@ -1003,7 +1003,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
                [o save];
              } 
-           else
+           else if ([[folders objectAtIndex:fi] isKindOfClass: [SOGoContactGCSFolder class]])
              {
                type = ([[[folders objectAtIndex:fi] nameInContainer] isEqualToString: personalFolderName] ? 9 : 14);
                [commands appendFormat: @"<%@><ServerId>%@</ServerId><ParentId>%@</ParentId><DisplayName>%@</DisplayName><Type>%d</Type></%@>", operation,
diff --git a/NEWS b/NEWS
index 21a42d621..2b9d9616b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+2.2.11a (2014-12-10)
+--------------------
+
+Bug fixes
+ - Make sure all address books returned using EAS are GCS ones
+
 2.2.11 (2014-12-09)
 -------------------