diff --git a/src/mapserver/qgsprojectparser.cpp b/src/mapserver/qgsprojectparser.cpp
index 0324f8c078a1..861fc5314ee2 100644
--- a/src/mapserver/qgsprojectparser.cpp
+++ b/src/mapserver/qgsprojectparser.cpp
@@ -629,6 +629,17 @@ void QgsProjectParser::addLayers( QDomDocument &doc,
       {
         continue;
       }
+      //vector layer without geometry
+      if ( currentLayer->type() == QgsMapLayer::VectorLayer )
+      {
+        QgsVectorLayer* vectorLayer = dynamic_cast<QgsVectorLayer*>( currentLayer );
+        QGis::WkbType wkbType = vectorLayer->wkbType();
+        if ( wkbType == QGis::WKBNoGeometry )
+        {
+          continue;
+        }
+      }
+      // queryable layer
       if ( nonIdentifiableLayers.contains( currentLayer->id() ) )
       {
         layerElem.setAttribute( "queryable", "0" );