diff --git a/src/app/i18n/locales/de.json b/src/app/i18n/locales/de.json
index f42a314c7..a875ab5c5 100644
--- a/src/app/i18n/locales/de.json
+++ b/src/app/i18n/locales/de.json
@@ -842,7 +842,7 @@
         "userItem": {
           "roles": {
             "owner": "Besitzer",
-            "editor": "Herausgeber",
+            "editor": "Bearbeiter",
             "reader": "Betrachter"
           },
           "remove": "Entfernen"
@@ -876,7 +876,7 @@
           "accept": "Akzeptieren",
           "deny": "Ablehnen",
           "roles": {
-            "editor": "Redakteur",
+            "editor": "Bearbeiter",
             "reader": "Betrachter"
           }
         }
@@ -916,7 +916,7 @@
         "duplicatedEmail": "Die E-Mail-Adresse existiert bereits",
         "email": "E-Mail eingeben",
         "invite": "Einladen",
-        "editor": "Redakteur",
+        "editor": "Bearbeiter",
         "reader": "Betrachter",
         "listUsers": "einzuladende Benutzer",
         "successSentInvitation": "Erfolgreiche Freigabe mit {{email}}",
diff --git a/src/components/SidenavWrapper.tsx b/src/components/SidenavWrapper.tsx
index d1e844842..aba91177e 100644
--- a/src/components/SidenavWrapper.tsx
+++ b/src/components/SidenavWrapper.tsx
@@ -52,6 +52,7 @@ const SidenavWrapper = ({
   const workspaceUuid = selectedWorkspace?.workspaceUser.workspaceId;
   const { itemsNavigation } = useSidenavNavigation();
   const { suiteArray } = useSuiteLauncher();
+  const userUsage = planUsage > 0 ? bytesToString(planUsage) : '0GB';
 
   const [isCollapsed, setIsCollapsed] = useState(() => {
     const savedState = sessionStorage.getItem('sidenav-collapsed');
@@ -131,7 +132,7 @@ const SidenavWrapper = ({
           )
         }
         storage={{
-          usage: bytesToString(planUsage),
+          usage: userUsage,
           limit: bytesToString(planLimit),
           percentage: Math.min((planUsage / planLimit) * 100, 100),
           onUpgradeClick: handleUpgradeClick,
diff --git a/src/views/Home/components/WorkspaceSelector.tsx b/src/views/Home/components/WorkspaceSelector.tsx
index 4fececc73..17bec1305 100644
--- a/src/views/Home/components/WorkspaceSelector.tsx
+++ b/src/views/Home/components/WorkspaceSelector.tsx
@@ -16,7 +16,6 @@ export interface Workspace {
 interface WorkspaceSelectorProps {
   userWorkspace: Workspace;
   workspaces: Workspace[];
-  onCreateWorkspaceButtonClicked: () => void;
   onChangeWorkspace: (workspaceId: string | null) => void;
   selectedWorkspace: Workspace | null;
   setIsDialogOpen: (boolean) => void;
@@ -71,7 +70,6 @@ const WorkspaceCard = ({
 const WorkspaceSelector: React.FC<WorkspaceSelectorProps> = ({
   userWorkspace,
   workspaces,
-  onCreateWorkspaceButtonClicked,
   onChangeWorkspace,
   setIsDialogOpen,
   pendingWorkspacesInvitesLength,
@@ -81,10 +79,12 @@ const WorkspaceSelector: React.FC<WorkspaceSelectorProps> = ({
   isCollapsed = false,
 }) => {
   const dropdownRef = useRef<HTMLInputElement>(null);
+  const isWorkspaceDropdownDisabled = workspaces.length === 0;
 
   const { translate } = useTranslationContext();
 
   const toggleDropdown = () => {
+    if (isWorkspaceDropdownDisabled) return;
     setIsWorkspaceSelectorOpen(!isWorkspaceSelectorOpen);
   };
 
@@ -115,7 +115,7 @@ const WorkspaceSelector: React.FC<WorkspaceSelectorProps> = ({
       <button
         className={`w-full rounded-lg border border-gray-10 ${
           isWorkspaceSelectorOpen ? 'bg-gray-1' : 'bg-surface'
-        } ${isCollapsed ? 'py-3 px-1.5' : 'p-3'} text-left dark:bg-gray-5`}
+        } ${isCollapsed ? 'py-3 px-1.5' : 'p-3'} ${isWorkspaceDropdownDisabled ? 'cursor-default' : 'cursor-pointer'} text-left dark:bg-gray-5`}
         onClick={toggleDropdown}
         title={isCollapsed ? selectedWorkspace?.name : undefined}
       >
@@ -159,7 +159,7 @@ const WorkspaceSelector: React.FC<WorkspaceSelectorProps> = ({
               </p>
             </div>
             <div className="w-4">
-              <CaretUpDown colorRendering="bg-gray-100" weight="bold" size={16} />
+              {!isWorkspaceDropdownDisabled && <CaretUpDown colorRendering="bg-gray-100" weight="bold" size={16} />}
             </div>
           </div>
         )}
diff --git a/src/views/Home/components/WorkspaceSelectorContainer.tsx b/src/views/Home/components/WorkspaceSelectorContainer.tsx
index b19a15d1c..deaaeae38 100644
--- a/src/views/Home/components/WorkspaceSelectorContainer.tsx
+++ b/src/views/Home/components/WorkspaceSelectorContainer.tsx
@@ -85,7 +85,6 @@ const WorkspaceSelectorContainer = ({ user, isCollapsed }: WorkspaceSelectorCont
         userWorkspace={userWorkspace}
         workspaces={allParsedWorkspaces}
         onChangeWorkspace={handleWorkspaceChange}
-        onCreateWorkspaceButtonClicked={() => undefined}
         selectedWorkspace={selectedWorkspace ? parseWorkspaces([selectedWorkspace])[0] : userWorkspace}
         pendingWorkspacesInvitesLength={pendingWorkspacesInvites.length}
         setIsDialogOpen={setIsDialogOpen}