diff --git a/.appveyor.yml b/.appveyor.yml
index a65948cc25..ea178c9076 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,6 +1,6 @@
 environment:
   global:
-    CHANS_DEV: "-c pyviz/label/dev -c bokeh/label/dev -c conda-forge"
+    CHANS_DEV: "-c pyviz/label/dev -c bokeh -c conda-forge"
   matrix:
     - PY: "3.6"
       CONDA: "C:\\Miniconda36-x64"
diff --git a/.travis.yml b/.travis.yml
index 6e437ded91..fdd82e47a5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,8 +19,8 @@ addons:
 env:
   global:
     - PYENV_VERSION=3.7
-    - CHANS_DEV="-c pyviz/label/dev -c bokeh/label/dev -c conda-forge"
-    - CHANS_REL="-c pyviz -c conda-forge"
+    - CHANS_DEV="-c pyviz/label/dev -c bokeh -c conda-forge"
+    - CHANS_REL="-c pyviz -c bokeh -c conda-forge"
     - LABELS_DEV="--label dev"
     - LABELS_REL="--label dev --label main"
     - PKG_TEST_PYTHON="--test-python=py36"
diff --git a/panel/pane/holoviews.py b/panel/pane/holoviews.py
index c956ba4619..0f00814e99 100644
--- a/panel/pane/holoviews.py
+++ b/panel/pane/holoviews.py
@@ -112,7 +112,7 @@ def _update_layout(self):
         else:
             try:
                 opts = Store.lookup_options(backend, self.object, 'plot').kwargs
-            except KeyError:
+            except:
                 opts = {}
         responsive_modes = ('stretch_width', 'stretch_both', 'scale_width', 'scale_both')
         center = self.center
@@ -520,7 +520,8 @@ def link_axes(root_view, root_model):
         if ref not in pane._plots:
             continue
         plot = pane._plots[ref][0]
-        if not pane.linked_axes or plot.renderer.backend != 'bokeh':
+        if (not pane.linked_axes or plot.renderer.backend != 'bokeh'
+            or not getattr(plot, 'shared_axes', False)):
             continue
         for p in plot.traverse(specs=[ElementPlot]):
             if p.current_frame is None: