diff --git a/.gitignore b/.gitignore
index e52d5a63a2e..ec6747baad1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -131,3 +131,5 @@ tramp
 
 # jEnv file
 .java-version
+.pre-commit-config.yaml
+trufflehog/
diff --git a/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java b/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java
index 930e42e0a27..33b5391a919 100644
--- a/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java
+++ b/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java
@@ -843,6 +843,8 @@ private InterpreterResult executeSql(String dbPrefix, String sql,
 
         if (interpreterName != null && interpreterName.startsWith("spark_rca_")) {
           statement.setQueryTimeout(10800); // 10800 seconds = 3 hours
+        } else if (interpreterName != null && interpreterName.startsWith("spark_")) {
+          statement.setQueryTimeout(3600); // 3600 seconds = 1 hour
         }
 
         // fetch n+1 rows in order to indicate there's more rows available (for large selects)