diff --git a/README.md b/README.md
index b892860f..57f143ce 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
       <img src="https://img.shields.io/badge/nodejs-18.15.0-dgreen" alt="node">
     </a>
     <a href="https://github.com/robolaunch/ui/releases">
-      <img src="https://img.shields.io/badge/release-v0.13.0-red" alt="release">
+      <img src="https://img.shields.io/badge/release-v0.13.1-red" alt="release">
     </a>
         <a href="#">
       <img src="https://img.shields.io/badge/language-typescript-blue" alt="language">
diff --git a/package.json b/package.json
index 9c8bda44..a89503d3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ui",
-  "version": "0.13.0",
+  "version": "0.13.1",
   "private": true,
   "dependencies": {
     "@emotion/css": "^11.10.6",
diff --git a/src/components/CreateForms/CreateRobotFormStep2.tsx b/src/components/CreateForms/CreateRobotFormStep2.tsx
index 187f7d13..3962ac70 100644
--- a/src/components/CreateForms/CreateRobotFormStep2.tsx
+++ b/src/components/CreateForms/CreateRobotFormStep2.tsx
@@ -44,7 +44,7 @@ export default function CreateRobotFormStep2({
       ? CreateEnvironmentFormStep2Validations
       : CreateRobotFormStep2Validations,
     initialValues: robotData?.step2,
-    onSubmit: async (values: any) => {
+    onSubmit: (values: any) => {
       formik.setSubmitting(true);
 
       if (envOnPremiseRobot) {
@@ -70,7 +70,7 @@ export default function CreateRobotFormStep2({
           await handleSubmit();
         });
       } else {
-        await dispatch(
+        dispatch(
           createRobot({
             organizationId: selectedState?.organization?.organizationId,
             roboticsCloudName: selectedState?.roboticsCloud?.name,
@@ -233,11 +233,8 @@ export default function CreateRobotFormStep2({
   }, [formik]);
 
   useEffect(() => {
-    console.log(
-      responseFleet?.fleetStatus !== "Ready" ||
-        responseFleet?.namespaceStatus !== "Active"
-    );
-  }, [responseFleet]);
+    console.log(formik);
+  }, [formik]);
 
   return (
     <CreateRobotFormLoader
diff --git a/src/components/SidebarLists/SidebarListItem.tsx b/src/components/SidebarLists/SidebarListItem.tsx
index 10b04359..c023c4a5 100644
--- a/src/components/SidebarLists/SidebarListItem.tsx
+++ b/src/components/SidebarLists/SidebarListItem.tsx
@@ -185,7 +185,10 @@ export default function SidebarListItem({
                 }
                 break;
               case "fleet":
-                if (data?.fleetStatus === "Ready") {
+                if (
+                  data?.fleetStatus === "Ready" ||
+                  data?.namespaceStatus === "Active"
+                ) {
                   setSelectedState({ ...selectedState, fleet: data });
                   setSidebarState({ ...sidebarState, isOpen: false });
                   navigate(url);
diff --git a/src/pages/DashboardsPage/FleetDashboardPage/FleetDashboardPage.tsx b/src/pages/DashboardsPage/FleetDashboardPage/FleetDashboardPage.tsx
index 41e8ae0f..bd5f84fe 100644
--- a/src/pages/DashboardsPage/FleetDashboardPage/FleetDashboardPage.tsx
+++ b/src/pages/DashboardsPage/FleetDashboardPage/FleetDashboardPage.tsx
@@ -13,7 +13,10 @@ import useFunctions from "../../../hooks/useFunctions";
 import DashboardLayout from "../../../layouts/DashboardLayout";
 import CountWidget from "../../../components/CountWidget/CountWidget";
 import RegionsWidget from "../../../components/RegionsWidget/RegionsWidget";
-import { envOnPremiseRobot } from "../../../helpers/envProvider";
+import {
+  envOnPremiseFleet,
+  envOnPremiseRobot,
+} from "../../../helpers/envProvider";
 import EnvironmentActionCells from "../../../components/ActionCells/EnvironmentActionCells";
 
 export default function FleetDashboardPage(): ReactElement {
@@ -27,6 +30,7 @@ export default function FleetDashboardPage(): ReactElement {
     getRoboticsCloud,
     getInstance,
     getFleet,
+    getNamespace,
     getRobots,
     getEnvironments,
   } = useFunctions();
@@ -42,7 +46,7 @@ export default function FleetDashboardPage(): ReactElement {
     } else if (pagesState?.instance?.name !== url?.instanceName) {
       handleGetInstance();
     } else if (pagesState?.fleet?.name !== url?.fleetName) {
-      handleGetFleet();
+      envOnPremiseFleet ? handleGetNamespace() : handleGetFleet();
     } else {
       envOnPremiseRobot ? handleGetEnvironments() : handleGetRobots();
     }
@@ -280,6 +284,23 @@ export default function FleetDashboardPage(): ReactElement {
     );
   }
 
+  function handleGetNamespace() {
+    getNamespace(
+      {
+        organizationId: selectedState?.organization?.organizationId,
+        roboticsCloudName: selectedState?.roboticsCloud?.name,
+        instanceId: selectedState?.instance?.instanceId,
+        region: selectedState?.instance?.region,
+        namespaceName: url?.fleetName as string,
+      },
+      {
+        isSetState: true,
+        ifErrorNavigateTo404: !responseRobots,
+        setPages: true,
+      }
+    );
+  }
+
   function handleGetRobots() {
     getRobots(
       {