diff --git a/src/main/java/net/tirasa/connid/bundles/googleapps/GroupHandler.java b/src/main/java/net/tirasa/connid/bundles/googleapps/GroupHandler.java
index 9234b4e..84d5708 100644
--- a/src/main/java/net/tirasa/connid/bundles/googleapps/GroupHandler.java
+++ b/src/main/java/net/tirasa/connid/bundles/googleapps/GroupHandler.java
@@ -34,6 +34,7 @@
 import com.google.common.escape.Escaper;
 import com.google.common.escape.Escapers;
 import java.io.IOException;
+import java.util.Collections;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
@@ -351,13 +352,13 @@ public Set<String> handleResult(final Directory.Groups.Aliases.List request, fin
                     return Optional.ofNullable(value.getAliases()).map(aliases -> aliases.stream().
                             map(map -> ((Map<String, String>) map).get(GoogleAppsUtil.ALIAS_ATTR)).
                             filter(Objects::nonNull).collect(Collectors.toSet())).
-                            orElse(Set.of());
+                            orElse(Collections.emptySet());
                 }
 
                 @Override
                 public Set<String> handleError(final Throwable e) {
                     LOG.error(e, "While getting aliases for {0}", groupKey);
-                    return Set.of();
+                    return Collections.emptySet();
                 }
             });
         } catch (IOException e) {
diff --git a/src/main/java/net/tirasa/connid/bundles/googleapps/UserHandler.java b/src/main/java/net/tirasa/connid/bundles/googleapps/UserHandler.java
index c5277a3..8fbc579 100644
--- a/src/main/java/net/tirasa/connid/bundles/googleapps/UserHandler.java
+++ b/src/main/java/net/tirasa/connid/bundles/googleapps/UserHandler.java
@@ -44,6 +44,7 @@
 import java.io.IOException;
 import java.util.Base64;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -988,13 +989,13 @@ public Set<String> handleResult(final Directory.Users.Aliases.List request, fina
                     return Optional.ofNullable(value.getAliases()).map(aliases -> aliases.stream().
                             map(map -> ((Map<String, String>) map).get(GoogleAppsUtil.ALIAS_ATTR)).
                             filter(Objects::nonNull).collect(Collectors.toSet())).
-                            orElse(Set.of());
+                            orElse(Collections.emptySet());
                 }
 
                 @Override
                 public Set<String> handleError(final Throwable e) {
                     LOG.error(e, "While getting aliases for {0}", userKey);
-                    return Set.of();
+                    return Collections.emptySet();
                 }
             });
         } catch (IOException e) {