diff --git a/wp-includes/plugin.php b/wp-includes/plugin.php
index c2bc9123a..b8bf524af 100644
--- a/wp-includes/plugin.php
+++ b/wp-includes/plugin.php
@@ -173,6 +173,9 @@ function do_action($tag, $arg = '') {
 function did_action($tag) {
 	global $wp_actions;
 
+	if ( empty($wp_actions) )
+		return 0;
+
 	return count(array_keys($wp_actions, $tag));
 }