diff --git a/.npmrc b/.npmrc
new file mode 100644
index 00000000..775942f6
--- /dev/null
+++ b/.npmrc
@@ -0,0 +1 @@
+registry=http://10.85.59.116/artifactory/v1.0/artifacts/npm/
diff --git a/src/core/RecyclerListView.tsx b/src/core/RecyclerListView.tsx
index 84b69f46..43c38f8d 100644
--- a/src/core/RecyclerListView.tsx
+++ b/src/core/RecyclerListView.tsx
@@ -300,7 +300,11 @@ export default class RecyclerListView<P extends RecyclerListViewProps, S extends
 
     public getCurrentScrollOffset(): number {
         const viewabilityTracker = this._virtualRenderer.getViewabilityTracker();
-        return viewabilityTracker ? viewabilityTracker.getLastActualOffset() + this.props.distanceFromWindow! : 0;
+        let currentOffset = (viewabilityTracker ? viewabilityTracker.getLastActualOffset() : 0);
+        if (currentOffset > this.props.distanceFromWindow) {
+            currentOffset += this.props.distanceFromWindow!;
+        }
+        return currentOffset;
     }
 
     public findApproxFirstVisibleIndex(): number {