diff --git a/guava/src/com/google/common/collect/CollectSpliterators.java b/guava/src/com/google/common/collect/CollectSpliterators.java
index 7d0e82f203a8..b6bb16b8a93e 100644
--- a/guava/src/com/google/common/collect/CollectSpliterators.java
+++ b/guava/src/com/google/common/collect/CollectSpliterators.java
@@ -96,6 +96,10 @@ public int characteristics() {
       @CheckForNull
       public Comparator<? super T> getComparator() {
         if (hasCharacteristics(Spliterator.SORTED)) {
+          if (Ordering.natural().equals(comparator)
+                  || Comparator.naturalOrder().equals(comparator)) {
+            return null;
+          }
           return comparator;
         } else {
           throw new IllegalStateException();
diff --git a/guava/src/com/google/common/collect/ImmutableSortedSet.java b/guava/src/com/google/common/collect/ImmutableSortedSet.java
index 20d007271298..034e9b9795c8 100644
--- a/guava/src/com/google/common/collect/ImmutableSortedSet.java
+++ b/guava/src/com/google/common/collect/ImmutableSortedSet.java
@@ -805,7 +805,12 @@ public boolean tryAdvance(Consumer<? super E> action) {
       }
 
       @Override
+      @CheckForNull
       public Comparator<? super E> getComparator() {
+        if (Ordering.natural().equals(comparator)
+                || Comparator.naturalOrder().equals(comparator)) {
+          return null;
+        }
         return comparator;
       }
     };