diff --git a/web/client/epics/identify.js b/web/client/epics/identify.js
index 2bf76cb985..e375336595 100644
--- a/web/client/epics/identify.js
+++ b/web/client/epics/identify.js
@@ -86,7 +86,7 @@ export const getFeatureInfoOnFeatureInfoClick = (action$, { getState = () => { }
 
             const selectedLayers = selectedNodesSelector(getState());
 
-            if (queryableLayers.length === 0 || queryableSelectedLayers.length === 0 && selectedLayers.length !== 0) {
+            if (queryableLayers.length === 0 || enableInfoForSelectedLayers && queryableSelectedLayers.length === 0 && selectedLayers.length !== 0) {
                 return Rx.Observable.of(purgeMapInfoResults(), noQueryableLayers());
             }