diff --git a/sdk/src/lib/Job.spec.ts b/sdk/src/lib/Job.spec.ts
index 62a40ba..05dc1dc 100644
--- a/sdk/src/lib/Job.spec.ts
+++ b/sdk/src/lib/Job.spec.ts
@@ -88,6 +88,12 @@ describe('Job', () => {
       expect(() => job.setParams({}).setJobReference('')).not.toThrow();
     });
   });
+
+  describe('timeout', () => {
+    it('should default to two hours', () => {
+      expect(getSubmissionFromJob(job).getTimeoutMs()).toBe(1000 * 60 * 60 * 2);
+    });
+  });
 });
 
 function getSubmissionFromJob(job: Job) {
diff --git a/sdk/src/lib/Job.ts b/sdk/src/lib/Job.ts
index 0a2c698..2be66e8 100644
--- a/sdk/src/lib/Job.ts
+++ b/sdk/src/lib/Job.ts
@@ -25,7 +25,7 @@ export class Job {
     this.jobSubmission.setUuid(this.uuid);
     this.jobSubmission.setWorkflowType(type);
     this.jobSubmission.setEsdl(this.esdl);
-    this.jobSubmission.setTimeoutMs(0);
+    this.jobSubmission.setTimeoutMs(1000 * 60 * 60 * 2); // for now, hard code two hours.
   }
 
   public start() {
diff --git a/sdk/src/lib/handlers/ResultHandler.spec.ts b/sdk/src/lib/handlers/ResultHandler.spec.ts
index 2139e22..e840be3 100644
--- a/sdk/src/lib/handlers/ResultHandler.spec.ts
+++ b/sdk/src/lib/handlers/ResultHandler.spec.ts
@@ -29,7 +29,7 @@ describe('ResultsHandler', () => {
           logs: 'logs',
           outputEsdl: 'output_esdl',
           resultType: JobResult.ResultType.SUCCEEDED,
-          esdlMessagesList: []
+          esdlMessagesList: [],
         });
         done();
       });