diff --git a/src/libtracker-miner/tracker-sparql-buffer.c b/src/libtracker-miner/tracker-sparql-buffer.c
index b3ff07bd938d43b73d6662bd664cc2c715f5c5c3..40634f2c1e556bb861b9e7cfe57daa32c7314106 100644
--- a/src/libtracker-miner/tracker-sparql-buffer.c
+++ b/src/libtracker-miner/tracker-sparql-buffer.c
@@ -438,7 +438,7 @@ tracker_sparql_buffer_get_state (TrackerSparqlBuffer *buffer,
 	if (!tracker_task_pool_find (TRACKER_TASK_POOL (buffer), file))
 		return TRACKER_BUFFER_STATE_UNKNOWN;
 
-	if (g_hash_table_contains (priv->file_set, file))
+	if (priv->file_set != NULL && g_hash_table_contains (priv->file_set, file))
 		return TRACKER_BUFFER_STATE_QUEUED;
 
 	return TRACKER_BUFFER_STATE_FLUSHING;
diff --git a/src/miners/fs/tracker-miner-files.c b/src/miners/fs/tracker-miner-files.c
index dafb8dbf305a790c227852e3476c5a7a6775fd86..a7fed924cc8d2aaa5c00960d4397842ad497f028 100644
--- a/src/miners/fs/tracker-miner-files.c
+++ b/src/miners/fs/tracker-miner-files.c
@@ -2170,9 +2170,10 @@ miner_files_process_file (TrackerMinerFS      *fs,
 
 	graph = tracker_extract_module_manager_get_graph (mime_type);
 
-	if (graph) {
+	if (graph && g_file_info_get_size (file_info) > 0) {
 		/* This mimetype will be extracted by some module, pre-fill the
 		 * nfo:FileDataObject in that graph.
+		 * Empty files skipped as mime-type for those cannot be trusted.
 		 */
 		graph_file = tracker_resource_new (uri);
 		tracker_resource_add_uri (graph_file, "rdf:type", "nfo:FileDataObject");