diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBContainerTransactionManager.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBContainerTransactionManager.java
index facfac8e5f8..414daad885e 100755
--- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBContainerTransactionManager.java
+++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBContainerTransactionManager.java
@@ -81,7 +81,7 @@ public class EJBContainerTransactionManager {
         TransactionService txnService = ejbContainerUtilImpl.getServices().getService(TransactionService.class,
                 ServerEnvironment.DEFAULT_INSTANCE_NAME);
         int transactionTimeout = Integer.parseInt(txnService.getTimeoutInSeconds());
-        if (transactionTimeout != 0) {
+        if (transactionTimeout >= 0) {
             cmtTimeoutInSeconds = transactionTimeout;
         }
 
diff --git a/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/config/TransactionService.java b/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/config/TransactionService.java
index ff691c2e4b3..391d5fbeb38 100644
--- a/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/config/TransactionService.java
+++ b/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/config/TransactionService.java
@@ -75,7 +75,7 @@ public interface TransactionService extends ConfigBeanProxy, PropertyBag, Config
      * @return possible object is
      *         {@link String }
      */
-    @Attribute (defaultValue="0",dataType=Integer.class)
+    @Attribute (defaultValue="120",dataType=Integer.class)
     public String getTimeoutInSeconds();
 
     /**