diff --git a/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/repository/JdbcDataflowJobExecutionDao.java b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/repository/JdbcDataflowJobExecutionDao.java
index 4aecb3b514..afe716d761 100644
--- a/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/repository/JdbcDataflowJobExecutionDao.java
+++ b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/repository/JdbcDataflowJobExecutionDao.java
@@ -50,9 +50,9 @@ public class JdbcDataflowJobExecutionDao implements DataflowJobExecutionDao {
 	 */
 	private static final String SELECT_STEP_EXECUTION_IDS =
 			"SELECT SEC.STEP_EXECUTION_ID AS STEP_EXECUTION_ID " +
-			"FROM %PREFIX%STEP_EXECUTION_CONTEXT SEC " +
-			"JOIN %PREFIX%STEP_EXECUTION SE ON SE.STEP_EXECUTION_ID = SEC.STEP_EXECUTION_ID " +
-			"WHERE SE.JOB_EXECUTION_ID in (:jobExecutionIds)";
+			"FROM %PREFIX%STEP_EXECUTION_CONTEXT SEC, %PREFIX%STEP_EXECUTION SE " +
+			"WHERE SE.JOB_EXECUTION_ID in (:jobExecutionIds) " +
+			"AND SE.STEP_EXECUTION_ID = SEC.STEP_EXECUTION_ID";
 
 	/**
 	 * SQL statements for removing the Step Execution Context.
diff --git a/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/repository/JdbcDataflowTaskExecutionMetadataDao.java b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/repository/JdbcDataflowTaskExecutionMetadataDao.java
index 0f85163dbb..7f1eb94c62 100644
--- a/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/repository/JdbcDataflowTaskExecutionMetadataDao.java
+++ b/spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/repository/JdbcDataflowTaskExecutionMetadataDao.java
@@ -63,9 +63,9 @@ public class JdbcDataflowTaskExecutionMetadataDao implements DataflowTaskExecuti
 			"TASK_EXECUTION_MANIFEST) VALUES (:id, :taskExecutionId, :taskExecutionManifest)";
 
 	private static final String FIND_MANIFEST_BY_TASK_EXECUTION_ID = "SELECT M.TASK_EXECUTION_MANIFEST AS TASK_EXECUTION_MANIFEST " +
-			"FROM %PREFIX%EXECUTION_METADATA M INNER JOIN " +
-			"%PREFIX%EXECUTION E ON M.TASK_EXECUTION_ID = E.TASK_EXECUTION_ID " +
-			"WHERE E.TASK_EXECUTION_ID = :taskExecutionId";
+			"FROM %PREFIX%EXECUTION_METADATA M, %PREFIX%EXECUTION E " +
+			"WHERE M.TASK_EXECUTION_ID = E.TASK_EXECUTION_ID " +
+			"AND E.TASK_EXECUTION_ID = :taskExecutionId";
 
 	private static final String DELETE_MANIFEST_BY_TASK_EXECUTION_IDS = "DELETE FROM %PREFIX%EXECUTION_METADATA WHERE TASK_EXECUTION_ID IN (:taskExecutionIds)";