diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/uploadintime/SnapshotLocationController.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/uploadintime/SnapshotLocationController.java
index 14b64b223a..d5a03ce8ce 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/uploadintime/SnapshotLocationController.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/uploadintime/SnapshotLocationController.java
@@ -140,6 +140,9 @@ public class SnapshotLocationController {
                 mLastLocationInfo = null;
             }
         }
+        if (list.size() == 0) {
+            return null;
+        }
         //Logger.d( TAG, "upload loc size = %s", list == null ? 0 : list.size() );
         return list;
     }