diff --git a/command/agent/keyring.go b/command/agent/keyring.go
index f6d80a9dce..6df94d3c9b 100644
--- a/command/agent/keyring.go
+++ b/command/agent/keyring.go
@@ -50,6 +50,11 @@ func loadKeyringFile(c *serf.Config) error {
 		keysDecoded[i] = keyBytes
 	}
 
+	// Guard against empty keyring
+	if len(keysDecoded) == 0 {
+		return fmt.Errorf("no keys present in keyring file: %s", c.KeyringFile)
+	}
+
 	// Create the keyring
 	keyring, err := memberlist.NewKeyring(keysDecoded, keysDecoded[0])
 	if err != nil {