diff --git a/src/Jobs/Handler/Files.hs b/src/Jobs/Handler/Files.hs
index deaedd332..7ab592eb1 100644
--- a/src/Jobs/Handler/Files.hs
+++ b/src/Jobs/Handler/Files.hs
@@ -198,14 +198,14 @@ dispatchJobPruneUnreferencedFiles numIterations epoch iteration = JobHandlerAtom
         )
 
       E.delete . E.from $ \fileContentChunkUnreferenced -> do
-        let unreferencedChunkHash = E.subSelectForeign fileContentChunkUnreferenced FileContentChunkUnreferencedHash (E.^. FileContentChunkHash)
+        let unreferencedChunkHash = E.unKey $ fileContentChunkUnreferenced E.^. FileContentChunkUnreferencedHash
         E.where_ . E.subSelectOr . E.from $ \fileContentEntry -> do
           E.where_ $ fileContentEntry E.^. FileContentEntryChunkHash E.==. unreferencedChunkHash
           return $ E.any E.exists (fileReferences $ fileContentEntry E.^. FileContentEntryHash)
         E.where_ $ chunkIdFilter unreferencedChunkHash
 
       let unmarkWorkflowFiles (otoList -> fRefs) = E.delete . E.from $ \fileContentChunkUnreferenced -> do
-            let unreferencedChunkHash = E.subSelectForeign fileContentChunkUnreferenced FileContentChunkUnreferencedHash (E.^. FileContentChunkHash)
+            let unreferencedChunkHash = E.unKey $ fileContentChunkUnreferenced E.^. FileContentChunkUnreferencedHash
             E.where_ . E.subSelectOr . E.from $ \fileContentEntry -> do
               E.where_ $ fileContentEntry E.^. FileContentEntryChunkHash E.==. unreferencedChunkHash
               return $ fileContentEntry E.^. FileContentEntryHash `E.in_` E.valList fRefs 
@@ -216,7 +216,7 @@ dispatchJobPruneUnreferencedFiles numIterations epoch iteration = JobHandlerAtom
       let
         getEntryCandidates = E.selectSource . E.from $ \fileContentEntry -> do
           let unreferencedSince = E.subSelectMaybe . E.from $ \(fileContentEntry' `E.InnerJoin` fileContentChunkUnreferenced) -> do
-                let unreferencedChunkHash = E.subSelectForeign fileContentChunkUnreferenced FileContentChunkUnreferencedHash (E.^. FileContentChunkHash)
+                let unreferencedChunkHash = E.unKey $ fileContentChunkUnreferenced E.^. FileContentChunkUnreferencedHash
                 E.on $ fileContentEntry' E.^. FileContentEntryChunkHash E.==. unreferencedChunkHash
                 E.where_ $ fileContentEntry' E.^. FileContentEntryHash E.==. fileContentEntry E.^. FileContentEntryHash
                 E.where_ $ chunkIdFilter unreferencedChunkHash
@@ -240,7 +240,7 @@ dispatchJobPruneUnreferencedFiles numIterations epoch iteration = JobHandlerAtom
 
       let
         getChunkCandidates = E.selectSource . E.from $ \fileContentChunkUnreferenced -> do
-          let unreferencedChunkHash = E.subSelectForeign fileContentChunkUnreferenced FileContentChunkUnreferencedHash (E.^. FileContentChunkHash)
+          let unreferencedChunkHash = E.unKey $ fileContentChunkUnreferenced E.^. FileContentChunkUnreferencedHash
           E.where_ $ fileContentChunkUnreferenced E.^. FileContentChunkUnreferencedSince E.<. E.val (addUTCTime (-keep) now)
           E.where_ . E.not_ . E.exists . E.from $ \fileContentEntry ->
             E.where_ $ fileContentEntry E.^. FileContentEntryChunkHash E.==. unreferencedChunkHash