diff --git a/src/OnboardingSPA/components/CheckboxTemplate/CheckboxListSkeleton/index.js b/src/OnboardingSPA/components/CheckboxTemplate/CheckboxListSkeleton/index.js
index 37b9255fc..54e7b0aae 100644
--- a/src/OnboardingSPA/components/CheckboxTemplate/CheckboxListSkeleton/index.js
+++ b/src/OnboardingSPA/components/CheckboxTemplate/CheckboxListSkeleton/index.js
@@ -1,3 +1,4 @@
+import { memo } from '@wordpress/element';
 
 /**
  * Checkbox List Skeleton Component
@@ -35,4 +36,4 @@ const CheckboxListSkeleton = ({ count }) => {
     );
 };
 
-export default CheckboxListSkeleton;
+export default memo(CheckboxListSkeleton);
diff --git a/src/OnboardingSPA/components/LivePreview/BlockPreview/index.js b/src/OnboardingSPA/components/LivePreview/BlockPreview/index.js
index 6ae00f11d..f17fa5640 100644
--- a/src/OnboardingSPA/components/LivePreview/BlockPreview/index.js
+++ b/src/OnboardingSPA/components/LivePreview/BlockPreview/index.js
@@ -88,8 +88,6 @@ const BlockPreview = ( {
 		);
 	});
 
-	console.count('Rendered');
-	
 	return (
 		<div className={ `live-preview__container-${ styling }` }>
 			{ loading && <SkeletonLivePreview/> }
diff --git a/src/OnboardingSPA/components/Sidebar/components/LearnMore/Skeleton/SidebarSkeleton.js b/src/OnboardingSPA/components/Sidebar/components/LearnMore/Skeleton/SidebarSkeleton.js
index ed201d339..3abc89a6a 100644
--- a/src/OnboardingSPA/components/Sidebar/components/LearnMore/Skeleton/SidebarSkeleton.js
+++ b/src/OnboardingSPA/components/Sidebar/components/LearnMore/Skeleton/SidebarSkeleton.js
@@ -1,3 +1,5 @@
+import { memo } from '@wordpress/element';
+
 /** Skeleton Structure for the SideBar */
 const SidebarSkeleton = () => {
 	return (
@@ -35,4 +37,4 @@ const SidebarSkeleton = () => {
 	);
 };
 
-export default SidebarSkeleton;
+export default memo(SidebarSkeleton);