diff --git a/package.json b/package.json
index 63f20bef..29a8fff6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "plebchan",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "private": true,
   "dependencies": {
     "@babel/core": "7.21.3",
diff --git a/src/App.js b/src/App.js
index 91612c47..d13f5a3e 100755
--- a/src/App.js
+++ b/src/App.js
@@ -40,8 +40,8 @@ export default function App() {
 
   const account = useAccount();
 
-  const setErrorMessage = useError();
-  const setSuccessMessage = useSuccess();
+  const [, setErrorMessage] = useError();
+  const [, setSuccessMessage] = useSuccess();
 
 
   useEffect(() => {
diff --git a/src/components/modals/ModerationModal.jsx b/src/components/modals/ModerationModal.jsx
index 5c1d5f23..4ab9a2a0 100755
--- a/src/components/modals/ModerationModal.jsx
+++ b/src/components/modals/ModerationModal.jsx
@@ -27,7 +27,7 @@ const ModerationModal = ({ isOpen, closeModal, deletePost }) => {
   const [triggerPublishCommentEdit, setTriggerPublishCommentEdit] = useState(false);
 
   const [errorMessage, setErrorMessage] = useError();
-  const setSuccessMessage = useSuccess();
+  const [, setSuccessMessage] = useSuccess();
 
 
   useEffect(() => {
diff --git a/src/components/modals/ReplyModal.jsx b/src/components/modals/ReplyModal.jsx
index 225de91b..1e824cdd 100755
--- a/src/components/modals/ReplyModal.jsx
+++ b/src/components/modals/ReplyModal.jsx
@@ -23,7 +23,7 @@ const ReplyModal = ({ isOpen, closeModal }) => {
 
   const account = useAccount();
 
-  const setErrorMessage = useError();
+  const [, setErrorMessage] = useError();
   
   const nodeRef = useRef(null);
   const nameRef = useRef();
diff --git a/src/components/modals/SettingsModal.jsx b/src/components/modals/SettingsModal.jsx
index a34e015c..4003b70e 100755
--- a/src/components/modals/SettingsModal.jsx
+++ b/src/components/modals/SettingsModal.jsx
@@ -21,7 +21,7 @@ const SettingsModal = ({ isOpen, closeModal }) => {
   const [accountJson, setAccountJson] = useState(null);
 
   const setErrorMessage = useError();
-  const setSuccessMessage = useSuccess();
+  const [, setSuccessMessage] = useSuccess();
 
   const account = useAccount();
   const { accounts } = useAccounts();
diff --git a/src/components/views/All.jsx b/src/components/views/All.jsx
index d64365d5..b83b8f5c 100755
--- a/src/components/views/All.jsx
+++ b/src/components/views/All.jsx
@@ -328,9 +328,7 @@ const All = () => {
         <Tooltip id="tooltip" className="tooltip" />
         <BoardForm selectedStyle={selectedStyle}>
           <div className="board">
-            { feed.length < 1 ? (
-              null
-            ) : (
+            {feed.length > 0 ? (
               <Virtuoso
                 increaseViewportBy={2000}
                 data={selectedFeed}
@@ -1245,6 +1243,8 @@ const All = () => {
                 useWindowScroll={true}
                 components={{ Footer: hasMore ? () => <PostLoader /> : null }}
               />
+            ) : (
+              <PostLoader />
             )}
           </div>
           {createPortal(
diff --git a/src/components/views/AllCatalog.jsx b/src/components/views/AllCatalog.jsx
index 45f19728..50947405 100755
--- a/src/components/views/AllCatalog.jsx
+++ b/src/components/views/AllCatalog.jsx
@@ -9,6 +9,7 @@ import useGeneralStore from '../../hooks/stores/useGeneralStore';
 import { Container, NavBar, Header, Break} from '../styled/views/Board.styled';
 import { Threads } from '../styled/views/Catalog.styled';
 import { TopBar, Footer } from '../styled/views/Thread.styled';
+import CatalogLoader from '../CatalogLoader';
 import ImageBanner from '../ImageBanner';
 import OfflineIndicator from '../OfflineIndicator';
 import SettingsModal from '../modals/SettingsModal';
@@ -207,9 +208,7 @@ const AllCatalog = () => {
         </TopBar>
         <Tooltip id="tooltip" className="tooltip" />
         <Threads selectedStyle={selectedStyle}>
-          { feed.length < 1 ? (
-            null
-          ) : (
+          {feed.length > 0 ? (
             <InfiniteScroll
               pageStart={0}
               loadMore={tryLoadMore}
@@ -289,6 +288,8 @@ const AllCatalog = () => {
                   </Link>
                 )})}
             </InfiniteScroll>
+          ) : (
+            <CatalogLoader />
           )}
         </Threads>
         <Footer selectedStyle={selectedStyle}>
diff --git a/src/components/views/Board.jsx b/src/components/views/Board.jsx
index f6e07103..f033d3b5 100755
--- a/src/components/views/Board.jsx
+++ b/src/components/views/Board.jsx
@@ -70,7 +70,7 @@ const Board = () => {
   const { subplebbitAddress } = useParams();
   
   const [errorMessage, setErrorMessage] = useError();
-  const setSuccessMessage = useSuccess();
+  const [, setSuccessMessage] = useSuccess();
 
   const nameRef = useRef();
   const subjectRef = useRef();
diff --git a/src/components/views/Catalog.jsx b/src/components/views/Catalog.jsx
index 50ca385e..768f33c5 100755
--- a/src/components/views/Catalog.jsx
+++ b/src/components/views/Catalog.jsx
@@ -61,7 +61,7 @@ const Catalog = () => {
   const navigate = useNavigate();
   
   const [errorMessage, setErrorMessage] = useError();
-  const setSuccessMessage = useSuccess();
+  const [, setSuccessMessage] = useSuccess();
   
   const [triggerPublishComment, setTriggerPublishComment] = useState(false);
   const [prevScrollPos, setPrevScrollPos] = useState(0);
diff --git a/src/components/views/Thread.jsx b/src/components/views/Thread.jsx
index de9de0bf..7492adcb 100755
--- a/src/components/views/Thread.jsx
+++ b/src/components/views/Thread.jsx
@@ -69,7 +69,7 @@ const Thread = () => {
   const handleClickForm = useClickForm();
 
   const [errorMessage, setErrorMessage] = useError();
-  const setSuccessMessage = useSuccess();
+  const [, setSuccessMessage] = useSuccess();
 
   const nameRef = useRef();
   const commentRef = useRef();