diff --git a/router.go b/router.go
index 7b156fa9..f419c2e7 100644
--- a/router.go
+++ b/router.go
@@ -286,7 +286,7 @@ func (r *Router) Find(method, path string, ctx *Context) (h HandlerFunc, e *Echo
 	// Strip trailing slash
 	if r.echo.stripTrailingSlash {
 		l := len(path)
-		if path[l-1] == '/' {
+		if path != "" && path[l-1] == '/'  { // Issue #218
 			path = path[:l-1]
 		}
 	}
@@ -300,8 +300,6 @@ func (r *Router) Find(method, path string, ctx *Context) (h HandlerFunc, e *Echo
 		ns     string // Next search
 	)
 
-	// TODO: Check empty path???
-
 	// Search order static > param > match-any
 	for {
 		if search == "" {