diff --git a/includes/flag.features.inc b/includes/flag.features.inc
index f1fb30e..bc45aa2
--- a/includes/flag.features.inc
+++ b/includes/flag.features.inc
@@ -106,5 +106,11 @@ function flag_features_providing_module() {
       $modules[$key] = isset($value['module']) ? $value['module'] : $module;
     }
   }
+  // Any entity type without a providing module will be provided for by the flag module
+  foreach (entity_get_info() as $entity_type => $entity) {
+    if (!isset($modules[$entity_type]) && empty($entity['configuration']) && $entity_type !== 'taxonomy_vocabulary') {
+      $modules[$entity_type] = 'flag';
+    }
+  }
   return $modules;
 }