diff --git a/packages/pl-fe/src/components/scrollable-list.tsx b/packages/pl-fe/src/components/scrollable-list.tsx
index 5026f0cca..6d08a52a0 100644
--- a/packages/pl-fe/src/components/scrollable-list.tsx
+++ b/packages/pl-fe/src/components/scrollable-list.tsx
@@ -175,7 +175,7 @@ const ScrollableList = React.forwardRef<Virtualizer<any, any>, IScrollableList>(
       id={'parentRef' in props ? id : undefined}
       className={listClassName}
       style={{
-        height: !showLoading && data.length ? virtualizer.getTotalSize() : undefined,
+        height: (!showLoading || showPlaceholder) && data.length ? virtualizer.getTotalSize() : undefined,
         width: '100%',
         position: 'relative',
       }}
diff --git a/packages/pl-fe/src/components/status.tsx b/packages/pl-fe/src/components/status.tsx
index e22aa5c5a..2a68df1a4 100644
--- a/packages/pl-fe/src/components/status.tsx
+++ b/packages/pl-fe/src/components/status.tsx
@@ -410,8 +410,8 @@ const Status: React.FC<IStatus> = (props) => {
             avatarSize={avatarSize}
             items={(
               <>
-                <StatusTypeIcon status={status} />
-                <StatusLanguagePicker status={status} />
+                <StatusTypeIcon status={actualStatus} />
+                <StatusLanguagePicker status={actualStatus} />
               </>
             )}
           />
diff --git a/packages/pl-fe/src/features/status/components/detailed-status.tsx b/packages/pl-fe/src/features/status/components/detailed-status.tsx
index a7d158081..728b5db95 100644
--- a/packages/pl-fe/src/features/status/components/detailed-status.tsx
+++ b/packages/pl-fe/src/features/status/components/detailed-status.tsx
@@ -166,7 +166,7 @@ const DetailedStatus: React.FC<IDetailedStatus> = ({
 
             <StatusTypeIcon status={actualStatus} />
 
-            <StatusLanguagePicker status={status} showLabel />
+            <StatusLanguagePicker status={actualStatus} showLabel />
           </HStack>
         </HStack>
       </div>