diff --git a/package.json b/package.json
index 45602682..ddfffbf5 100644
--- a/package.json
+++ b/package.json
@@ -43,13 +43,13 @@
     "react-native": ">= 0.30.0"
   },
   "devDependencies": {
-    "@types/lodash.debounce": "4.0.3",
+    "@types/lodash.debounce": "4.0.8",
     "@types/prop-types": "15.5.2",
-    "@types/react-native": "0.49.5",
     "@types/react": "16.4.7",
-    "@types/resize-observer-browser": "^0.1.7",
+    "@types/react-native": "0.49.5",
+    "@types/resize-observer-browser": "0.1.7",
     "file-directives": "1.4.6",
     "tslint": "5.11.0",
-    "typescript": "3.3.1"
+    "typescript": "4.9.5"
   }
 }
diff --git a/src/core/RecyclerListView.tsx b/src/core/RecyclerListView.tsx
index 95dd87be..d12edc14 100644
--- a/src/core/RecyclerListView.tsx
+++ b/src/core/RecyclerListView.tsx
@@ -589,7 +589,13 @@ export default class RecyclerListView<P extends RecyclerListViewProps, S extends
     }
 
     private _initStateIfRequired(stack?: RenderStack): boolean {
-        if (!this.state) {
+        /**
+         * this is to ensure that if the component does not has state and not render before
+         * we still initialize the state like how we do in constructor.
+         * else return false to let the caller to call setState
+         * so the component can re-render to the correct stack
+         */
+        if (!this.state && !this.getHasRenderedOnce()) {
             this.state = {
                 internalSnapshot: {},
                 renderStack: stack,
diff --git a/src/core/layoutmanager/LayoutManager.ts b/src/core/layoutmanager/LayoutManager.ts
index 94c34bde..32aee31a 100644
--- a/src/core/layoutmanager/LayoutManager.ts
+++ b/src/core/layoutmanager/LayoutManager.ts
@@ -74,6 +74,18 @@ export class WrapGridLayoutManager extends LayoutManager {
     public getContentDimension(): Dimension {
         return { height: this._totalHeight, width: this._totalWidth };
     }
+    /**
+     * when remove layout is called, it will remove the layout from the layouts array
+     * and if the layouts array is empty, it will reset the total height and total width to 0
+     * @param index
+     */
+     public removeLayout(index: number): void {
+        super.removeLayout(index);
+        if (this._layouts.length === 0) {
+            this._totalHeight = 0;
+            this._totalWidth = 0;
+        }
+    }
 
     public getLayouts(): Layout[] {
         return this._layouts;
diff --git a/src/utils/ComponentCompat.ts b/src/utils/ComponentCompat.ts
index c9bfec31..a75bc559 100644
--- a/src/utils/ComponentCompat.ts
+++ b/src/utils/ComponentCompat.ts
@@ -16,6 +16,14 @@ export abstract class ComponentCompat<T1 = {}, T2 = {}, SS = any> extends React.
         return true;
     }
 
+    /**
+     * allow the extended component to access _hasRenderedOnce flag
+     * to ensure that the component has rendered at least once
+     * @returns _hasRenderedOnce
+     */
+    public getHasRenderedOnce(): boolean {
+        return this._hasRenderedOnce;
+    }
     //setState inside will not update the existing cycle, not a true replacement for componentWillReceiveProps
     public componentWillReceivePropsCompat(newProps: T1): void {
         //no op