diff --git a/packages/ui/src/elements/PublishButton/index.tsx b/packages/ui/src/elements/PublishButton/index.tsx
index c1765e68b..5cba012f0 100644
--- a/packages/ui/src/elements/PublishButton/index.tsx
+++ b/packages/ui/src/elements/PublishButton/index.tsx
@@ -43,8 +43,7 @@ export const DefaultPublishButton: React.FC<{ label?: string }> = ({ label: labe
   const { code } = useLocale()
   const label = labelProp || t('version:publishChanges')
 
-  const hasNewerVersions =
-    unpublishedVersions?.totalDocs > 0 && unpublishedVersions?.docs[0]?.version?._status === 'draft'
+  const hasNewerVersions = unpublishedVersions?.totalDocs > 0
   const canPublish = hasPublishPermission && (modified || hasNewerVersions || !publishedDoc)
   const operation = useOperation()
 
diff --git a/packages/ui/src/elements/Status/index.tsx b/packages/ui/src/elements/Status/index.tsx
index b5e3046e6..c63a10891 100644
--- a/packages/ui/src/elements/Status/index.tsx
+++ b/packages/ui/src/elements/Status/index.tsx
@@ -41,22 +41,14 @@ export const Status: React.FC = () => {
 
   let statusToRender: 'changed' | 'draft' | 'published'
 
-  const isChangedFromPublished = unpublishedVersions?.docs?.[0]?.version?._status === 'draft'
-
-  if (unpublishedVersions?.docs?.length > 0 && isChangedFromPublished && publishedDoc) {
+  if (unpublishedVersions?.docs?.length > 0 && publishedDoc) {
     statusToRender = 'changed'
   } else if (!publishedDoc) {
     statusToRender = 'draft'
-  } else if (publishedDoc && unpublishedVersions?.docs?.length <= 2) {
+  } else if (publishedDoc && unpublishedVersions?.docs?.length <= 0) {
     statusToRender = 'published'
   }
 
-  const lastVersion = unpublishedVersions?.docs?.[0]
-
-  if (lastVersion && lastVersion.publishedLocale) {
-    statusToRender = locale === lastVersion.publishedLocale ? 'published' : 'draft'
-  }
-
   const performAction = useCallback(
     async (action: 'revert' | 'unpublish') => {
       let url
diff --git a/packages/ui/src/providers/DocumentInfo/index.tsx b/packages/ui/src/providers/DocumentInfo/index.tsx
index b74c9119c..114b0b363 100644
--- a/packages/ui/src/providers/DocumentInfo/index.tsx
+++ b/packages/ui/src/providers/DocumentInfo/index.tsx
@@ -340,18 +340,9 @@ const DocumentInfo: React.FC<
               and: [
                 ...versionParams.where.and,
                 {
-                  or: [
-                    {
-                      updatedAt: {
-                        greater_than: publishedJSON.updatedAt,
-                      },
-                    },
-                    {
-                      latest: {
-                        equals: true,
-                      },
-                    },
-                  ],
+                  updatedAt: {
+                    greater_than: publishedJSON.updatedAt,
+                  },
                 },
               ],
             },