diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26539db..c80eb1c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+### Fixed
+- TensorFlow image not being set if no suitable image is found for
+`misc tensorboard` command
+
 ## [2.6.1] - 2017-05-01
 ### Added
 - `misc tensorboard` command added which automatically instantiates a
diff --git a/convoy/misc.py b/convoy/misc.py
index 7c2a3d5..9257817 100644
--- a/convoy/misc.py
+++ b/convoy/misc.py
@@ -172,6 +172,7 @@ def tunnel_tensorboard(batch_client, config, jobid, taskid, logdir, image):
         logger.warning(
             'no pre-loaded tensorflow Docker image detected on pool, '
             'using: {}'.format(tb[0]))
+        image = tb[0]
     # get node remote login settings
     rls = batch_client.compute_node.get_remote_login_settings(
         pool.id, task.node_info.node_id)