diff --git a/dataset/src/integrationTest/kotlin/com/cosmotech/dataset/service/DatasetServiceIntegrationTest.kt b/dataset/src/integrationTest/kotlin/com/cosmotech/dataset/service/DatasetServiceIntegrationTest.kt
index 6e71aa30b..dc236312b 100644
--- a/dataset/src/integrationTest/kotlin/com/cosmotech/dataset/service/DatasetServiceIntegrationTest.kt
+++ b/dataset/src/integrationTest/kotlin/com/cosmotech/dataset/service/DatasetServiceIntegrationTest.kt
@@ -339,7 +339,7 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() {
     organizationSaved = organizationApiService.registerOrganization(organization)
     val numberOfDatasets = 20
     val defaultPageSize = csmPlatformProperties.twincache.dataset.defaultPageSize
-    val expectedSize = 15
+    val expectedPageSize = 15
     IntRange(1, numberOfDatasets).forEach {
       datasetApiService.createDataset(
           organizationSaved.id!!, makeDataset("d-dataset-$it", "dataset-$it"))
@@ -351,19 +351,19 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() {
 
     logger.info("should find all datasets and assert there are $numberOfDatasets")
     var datasetList = datasetApiService.findAllDatasets(organizationSaved.id!!, null, null)
-    assertEquals(numberOfDatasets + 1, datasetList.size)
+    assertEquals(numberOfDatasets, datasetList.size)
 
     logger.info("should find all datasets and assert it equals defaultPageSize: $defaultPageSize")
     datasetList = datasetApiService.findAllDatasets(organizationSaved.id!!, 0, null)
     assertEquals(defaultPageSize, datasetList.size)
 
-    logger.info("should find all datasets and assert there are expected size: $expectedSize")
-    datasetList = datasetApiService.findAllDatasets(organizationSaved.id!!, 0, expectedSize)
-    assertEquals(expectedSize, datasetList.size)
+    logger.info("should find all datasets and assert there are expected size: $expectedPageSize")
+    datasetList = datasetApiService.findAllDatasets(organizationSaved.id!!, 0, expectedPageSize)
+    assertEquals(expectedPageSize, datasetList.size)
 
     logger.info("should find all solutions and assert it returns the second / last page")
-    datasetList = datasetApiService.findAllDatasets(organizationSaved.id!!, 1, expectedSize)
-    assertEquals(numberOfDatasets - expectedSize + 1, datasetList.size)
+    datasetList = datasetApiService.findAllDatasets(organizationSaved.id!!, 1, expectedPageSize)
+    assertEquals(numberOfDatasets - expectedPageSize, datasetList.size)
   }
 
   @Test
@@ -440,33 +440,43 @@ class DatasetServiceIntegrationTest : CsmRedisTestBase() {
   }
 
   @Test
-  fun `test find All Datasets with different pagination params`() {
+  fun `PROD-12947 - test find All Datasets as Platform Admin`() {
     organizationSaved = organizationApiService.registerOrganization(organization)
+
+    // Create a dataset that current user should not see because he does not have permission to
     val numberOfDatasets = 20
-    val defaultPageSize = csmPlatformProperties.twincache.dataset.defaultPageSize
-    val expectedSize = 15
     IntRange(1, numberOfDatasets).forEach {
       datasetApiService.createDataset(
-          organizationSaved.id!!, makeDatasetWithRole("d-dataset-$it", "dataset-$it"))
+          organizationSaved.id!!,
+          makeDatasetWithRole(
+              organizationId = organizationSaved.id!!, userName = "unknown_user@test.com"))
     }
 
-    logger.info("should find all datasets and assert there are $numberOfDatasets")
+    // Explicitly set connected user information
+    every { getCurrentAccountIdentifier(any()) } returns TEST_USER_MAIL
+    every { getCurrentAuthenticatedUserName(csmPlatformProperties) } returns "test.user"
+    every { getCurrentAuthenticatedRoles(any()) } returns listOf(ROLE_PLATFORM_ADMIN)
+
+    logger.info("should find all datasets because of admin permission")
     var datasetList = datasetApiService.findAllDatasets(organizationSaved.id!!, null, null)
     assertEquals(numberOfDatasets, datasetList.size)
 
-    logger.info("should find all datasets and assert it equals defaultPageSize: $defaultPageSize")
-    datasetList = datasetApiService.findAllDatasets(organizationSaved.id!!, 0, null)
-    assertEquals(defaultPageSize, datasetList.size)
-
-    logger.info("should find all datasets and assert there are expected size: $expectedSize")
-    datasetList = datasetApiService.findAllDatasets(organizationSaved.id!!, 0, expectedSize)
-    assertEquals(expectedSize, datasetList.size)
+    // Create a dataset that current user should not see because it has been created under another
+    // organization
+    val newOrganization = organizationApiService.registerOrganization(makeOrganizationWithRole())
+    val datasetNotReachableByCurrentUserBecausePartOfAnotherOrganization =
+        datasetApiService.createDataset(
+            newOrganization.id!!, makeDatasetWithRole(organizationId = newOrganization.id!!))
+    assertNotNull(datasetNotReachableByCurrentUserBecausePartOfAnotherOrganization)
+    logger.info("should not find the new dataset because it was created in another organization")
+    datasetList = datasetApiService.findAllDatasets(organizationSaved.id!!, null, null)
+    assertEquals(numberOfDatasets, datasetList.size)
 
-    logger.info("should find all solutions and assert it returns the second / last page")
-    datasetList = datasetApiService.findAllDatasets(organizationSaved.id!!, 1, expectedSize)
-    assertEquals(numberOfDatasets - expectedSize, datasetList.size)
+    logger.info("should find only one dataset")
+    datasetList = datasetApiService.findAllDatasets(newOrganization.id!!, null, null)
+    assertEquals(1, datasetList.size)
+    assertEquals(datasetNotReachableByCurrentUserBecausePartOfAnotherOrganization, datasetList[0])
   }
-
   @Test
   fun `test find All Datasets with wrong pagination params`() {
     organizationSaved = organizationApiService.registerOrganization(organization)
diff --git a/dataset/src/main/kotlin/com/cosmotech/dataset/service/DatasetServiceImpl.kt b/dataset/src/main/kotlin/com/cosmotech/dataset/service/DatasetServiceImpl.kt
index 34b13970b..31797e49a 100644
--- a/dataset/src/main/kotlin/com/cosmotech/dataset/service/DatasetServiceImpl.kt
+++ b/dataset/src/main/kotlin/com/cosmotech/dataset/service/DatasetServiceImpl.kt
@@ -155,7 +155,7 @@ class DatasetServiceImpl(
               val currentUser = getCurrentAccountIdentifier(this.csmPlatformProperties)
               datasetRepository.findByOrganizationId(organizationId, currentUser, it).toList()
             } else {
-              datasetRepository.findAll(it).toList()
+              datasetRepository.findByOrganizationIdNoSecurity(organizationId, it).toList()
             }
           }
     } else {
@@ -164,7 +164,7 @@ class DatasetServiceImpl(
             val currentUser = getCurrentAccountIdentifier(this.csmPlatformProperties)
             datasetRepository.findByOrganizationId(organizationId, currentUser, pageable).toList()
           } else {
-            datasetRepository.findAll(pageable).toList()
+            datasetRepository.findByOrganizationIdNoSecurity(organizationId, pageable).toList()
           }
     }
 
diff --git a/dataset/src/test/kotlin/com/cosmotech/dataset/service/DatasetServiceImplTests.kt b/dataset/src/test/kotlin/com/cosmotech/dataset/service/DatasetServiceImplTests.kt
index 58ab2525e..956425e98 100644
--- a/dataset/src/test/kotlin/com/cosmotech/dataset/service/DatasetServiceImplTests.kt
+++ b/dataset/src/test/kotlin/com/cosmotech/dataset/service/DatasetServiceImplTests.kt
@@ -43,7 +43,7 @@ import org.junit.jupiter.api.assertThrows
 import org.junit.jupiter.api.extension.ExtendWith
 import org.springframework.core.io.ByteArrayResource
 import org.springframework.data.domain.Page
-import org.springframework.data.domain.Pageable
+import org.springframework.data.domain.PageRequest
 import org.springframework.web.context.request.RequestContextHolder
 import org.springframework.web.context.request.ServletRequestAttributes
 import redis.clients.jedis.UnifiedJedis
@@ -100,7 +100,8 @@ class DatasetServiceImplTests {
   @Test
   fun `findAllDatasets should return empty list when no dataset exists`() {
     every { organizationService.getVerifiedOrganization(ORGANIZATION_ID) } returns Organization()
-    every { datasetRepository.findAll(any<Pageable>()) } returns Page.empty()
+    every { datasetRepository.findByOrganizationIdNoSecurity(any(), any<PageRequest>()) } returns
+        Page.empty()
 
     val result = datasetService.findAllDatasets(ORGANIZATION_ID, null, null)
     assertEquals(emptyList(), result)