diff --git a/src/components/App.jsx b/src/components/App.jsx
index 3e0158c8..6273df33 100644
--- a/src/components/App.jsx
+++ b/src/components/App.jsx
@@ -732,6 +732,7 @@ export default class App extends React.Component {
     /> : null
 
     const bottomPanel = (this.state.errors.length + this.state.infos.length) > 0 ? <MessagePanel
+      currentLayer={selectedLayer}
       onLayerSelect={this.onLayerSelect}
       mapStyle={this.state.mapStyle}
       errors={this.state.errors}
diff --git a/src/components/MessagePanel.jsx b/src/components/MessagePanel.jsx
index 373691eb..f114a8c4 100644
--- a/src/components/MessagePanel.jsx
+++ b/src/components/MessagePanel.jsx
@@ -7,6 +7,7 @@ class MessagePanel extends React.Component {
     infos: PropTypes.array,
     mapStyle: PropTypes.object,
     onLayerSelect: PropTypes.func,
+    currentLayer: PropTypes.object,
   }
 
   static defaultProps = {
@@ -18,17 +19,22 @@ class MessagePanel extends React.Component {
       let content;
       if (error.parsed && error.parsed.type === "layer") {
         const {parsed} = error;
-        const {mapStyle} = this.props;
+        const {mapStyle, currentLayer} = this.props;
         const layerId = mapStyle.layers[parsed.data.index].id;
         content = (
           <>
-            Layer <span>&apos;{layerId}&apos;</span>: {parsed.data.message} &mdash;&nbsp;
-            <button
-              className="maputnik-message-panel__switch-button"
-              onClick={() => this.props.onLayerSelect(layerId)}
-            >
-              switch to layer
-            </button>
+            Layer <span>&apos;{layerId}&apos;</span>: {parsed.data.message}
+            {currentLayer.id !== layerId &&
+              <>
+                &nbsp;&mdash;&nbsp;
+                <button
+                  className="maputnik-message-panel__switch-button"
+                  onClick={() => this.props.onLayerSelect(layerId)}
+                >
+                  switch to layer
+                </button>
+              </>
+            }
           </>
         );
       }