diff --git a/symmetric/src/main/resources/symmetric-database.xml b/symmetric/src/main/resources/symmetric-database.xml
index af1945d27a..044396e983 100644
--- a/symmetric/src/main/resources/symmetric-database.xml
+++ b/symmetric/src/main/resources/symmetric-database.xml
@@ -37,13 +37,17 @@
         <property name="queryTimeout" value="${db.sql.query.timeout.seconds}"/>
     </bean>
 
+    <!-- Data Loader without query timeout to fix memory problems with MySQL 5 driver -->
+    <bean id="dataLoaderTemplate" class="org.springframework.jdbc.core.JdbcTemplate">
+        <property name="dataSource" ref="dataSource" />
+    </bean>
+
     <bean id="dbDialect" class="org.jumpmind.symmetric.db.DbDialectFactory" scope="singleton">
         <property name="dataSource" ref="dataSource" />
     </bean>
 
     <bean id="txManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
         <property name="dataSource" ref="dataSource" />
-        <property name="defaultTimeout" value="${db.tx.timeout.seconds}"/>
     </bean>
 
     <bean id="transactionTemplate" class="org.springframework.transaction.support.TransactionTemplate">
diff --git a/symmetric/src/main/resources/symmetric-services.xml b/symmetric/src/main/resources/symmetric-services.xml
index 127f8d51f8..da8385f075 100644
--- a/symmetric/src/main/resources/symmetric-services.xml
+++ b/symmetric/src/main/resources/symmetric-services.xml
@@ -311,7 +311,7 @@
 
     <bean id="dataLoader" class="org.jumpmind.symmetric.load.csv.CsvLoader" scope="prototype">
         <property name="dbDialect" ref="dbDialect" />
-        <property name="jdbcTemplate" ref="jdbcTemplate" />
+        <property name="jdbcTemplate" ref="dataLoaderTemplate" />
         <property name="enableFallbackInsert" value="true" />
         <property name="enableFallbackUpdate" value="true" />
         <property name="allowMissingDelete" value="true" />