diff --git a/proto/Response.proto b/proto/Response.proto
index b973c1c3c605a89d42e6429ffbd210d12c0ba0df..d7045203b108764ec3118ae6e36ee2a859cae89d 100644
--- a/proto/Response.proto
+++ b/proto/Response.proto
@@ -49,8 +49,6 @@ message Response
 
 	message Metadata
 	{
-		//Metadata response state
-
 		enum State
 		{
 			ACCEPTED = 0;
@@ -58,9 +56,6 @@ message Response
 		}
 
 		required State state = 1;
-
-		//Metadata response status
-
 		required string status = 2;
 
 		//Block of rows with same timestamp
diff --git a/src/ProtocolManager.cpp b/src/ProtocolManager.cpp
index 7974b336db9cd8ab7246e6828c11025b56ac2631..c70dcab1d819ebdcd3a203ffb0de62d4546a47eb 100644
--- a/src/ProtocolManager.cpp
+++ b/src/ProtocolManager.cpp
@@ -447,6 +447,14 @@ void ProtocolManager::fillRow(Response::Metadata::Row* row)
 
         std::string name = props.get_name();
 
+        if(name.compare("storage_path")==0 || name.compare("file_path")==0)
+        {
+            #ifdef VERBOSE_DEBUG
+                INFO_STREAM << "ProtocolManager::fillRow() skipping " << name << endl;
+            #endif
+            continue;
+        }
+
         if(m_it->get_indicator(i) == soci::i_null)
         {
             #ifdef VERBOSE_DEBUG