diff --git a/database_info.c b/database_info.c
index 31c99a9247..491ed156fe 100644
--- a/database_info.c
+++ b/database_info.c
@@ -90,8 +90,8 @@ database_info_list_t *database_info_list_new(const char *rdb_path, const char *q
       db_info->max_users              = 0;
       db_info->releasemonth           = 0;
       db_info->releaseyear            = 0;
-      db_info->analog_supported       = 0;
-      db_info->rumble_supported       = 0;
+      db_info->analog_supported       = -1;
+      db_info->rumble_supported       = -1;
 
       for (j = 0; j < item.map.len; j++)
       {
@@ -152,7 +152,7 @@ database_info_list_t *database_info_list_new(const char *rdb_path, const char *q
          if (!strcmp(key->string.buff, "analog"))
             db_info->analog_supported = val->uint_;
       }
-i++;
+      i++;
    }
 
    database_info_list->list  = database_info;
diff --git a/database_info.h b/database_info.h
index c5317dbb08..18beae6d99 100644
--- a/database_info.h
+++ b/database_info.h
@@ -43,8 +43,8 @@ typedef struct
    unsigned max_users;
    unsigned releasemonth;
    unsigned releaseyear;
-   unsigned analog_supported;
-   unsigned rumble_supported;
+   int analog_supported;
+   int rumble_supported;
    void *userdata;
 } database_info_t;
 
diff --git a/menu/menu_entries_cbs.c b/menu/menu_entries_cbs.c
index 06ab0a2a1d..8ec936653c 100644
--- a/menu/menu_entries_cbs.c
+++ b/menu/menu_entries_cbs.c
@@ -868,12 +868,14 @@ static int deferred_push_rdb_entry_detail(void *data, void *userdata,
       }
       snprintf(tmp, sizeof(tmp),
             "Analog supported: %s",
-            db_info_entry->analog_supported ? "true" : "false");
+            (db_info_entry->analog_supported == 1)  ? "true" : 
+            (db_info_entry->analog_supported == -1) ? "N/A"  : "false");
       menu_list_push(list, tmp, "rdb_entry_analog",
             0, 0);
       snprintf(tmp, sizeof(tmp),
             "Rumble supported: %s",
-            db_info_entry->rumble_supported ? "true" : "false");
+            (db_info_entry->rumble_supported == 1)  ? "true" : 
+            (db_info_entry->rumble_supported == -1) ? "N/A"  :  "false");
       menu_list_push(list, tmp, "rdb_entry_rumble",
             0, 0);
    }