diff --git a/web/core/components/issues/workspace-draft/root.tsx b/web/core/components/issues/workspace-draft/root.tsx
index f0f392f3f7d..177b8af556c 100644
--- a/web/core/components/issues/workspace-draft/root.tsx
+++ b/web/core/components/issues/workspace-draft/root.tsx
@@ -33,7 +33,7 @@ export const WorkspaceDraftIssuesRoot: FC<TWorkspaceDraftIssuesRoot> = observer(
   useWorkspaceIssueProperties(workspaceSlug);
 
   // fetching issues
-  useSWR(
+  const { isLoading } = useSWR(
     workspaceSlug && issueIds.length <= 0 ? `WORKSPACE_DRAFT_ISSUES_${workspaceSlug}` : null,
     workspaceSlug && issueIds.length <= 0 ? async () => await fetchIssues(workspaceSlug, "init-loader") : null
   );
@@ -44,6 +44,10 @@ export const WorkspaceDraftIssuesRoot: FC<TWorkspaceDraftIssuesRoot> = observer(
     await fetchIssues(workspaceSlug, "pagination", EDraftIssuePaginationType.NEXT);
   };
 
+  if (isLoading) {
+    return <WorkspaceDraftIssuesLoader items={14} />;
+  }
+
   if (workspaceProjectIds?.length === 0)
     return (
       <EmptyState
@@ -57,10 +61,6 @@ export const WorkspaceDraftIssuesRoot: FC<TWorkspaceDraftIssuesRoot> = observer(
 
   if (issueIds.length <= 0) return <WorkspaceDraftEmptyState />;
 
-  if (loader === "init-loader") {
-    return <WorkspaceDraftIssuesLoader items={14} />;
-  }
-
   return (
     <div className="relative">
       <div className="relative">