diff --git a/app/components/job-log.js b/app/components/job-log.js
index c4d01e9e..c460dbf8 100644
--- a/app/components/job-log.js
+++ b/app/components/job-log.js
@@ -6,11 +6,11 @@ export default Ember.Component.extend({
   didReceiveAttrs: function(options) {
     this._super(...arguments);
 
-    if(options.oldAttrs && options.oldAttrs.job) {
+    if(options.oldAttrs && options.oldAttrs.job && options.oldAttrs.job.value) {
       this.teardownLog(options.oldAttrs.job.value);
     }
 
-    if(options.newAttrs && options.newAttrs.job) {
+    if(options.newAttrs && options.newAttrs.job && options.newAttrs.job.value) {
       this.setupLog(options.newAttrs.job.value);
     }
   },