diff --git a/devenv/docker/blocks/loki/docker-compose.yaml b/devenv/docker/blocks/loki/docker-compose.yaml
index d6cf21f7856..bd4f8d3c728 100644
--- a/devenv/docker/blocks/loki/docker-compose.yaml
+++ b/devenv/docker/blocks/loki/docker-compose.yaml
@@ -20,3 +20,5 @@ services:
       -config.file=/etc/promtail/docker-config.yaml
     networks:
       - loki
+    depends_on:
+      - loki
diff --git a/pkg/services/auth/auth_token.go b/pkg/services/auth/auth_token.go
index deb3c1a5bba..5cb43974d34 100644
--- a/pkg/services/auth/auth_token.go
+++ b/pkg/services/auth/auth_token.go
@@ -121,18 +121,10 @@ func (s *UserAuthTokenServiceImpl) SignOutUser(c *models.ReqContext) error {
 	hashedToken := hashToken(unhashedToken)
 
 	sql := `DELETE FROM user_auth_token WHERE auth_token = ?`
-	res, err := s.SQLStore.NewSession().Exec(sql, hashedToken)
-	if err != nil {
-		return err
-	}
+	_, err := s.SQLStore.NewSession().Exec(sql, hashedToken)
 
-	affected, _ := res.RowsAffected()
-	if affected > 0 {
-		s.writeSessionCookie(c, "", -1)
-		return nil
-	}
-
-	return errors.New("failed to delete session")
+	s.writeSessionCookie(c, "", -1)
+	return err
 }
 
 func (s *UserAuthTokenServiceImpl) CreateToken(userId int64, clientIP, userAgent string) (*userAuthToken, error) {
diff --git a/pkg/services/auth/auth_token_test.go b/pkg/services/auth/auth_token_test.go
index e58fe795b4a..312e53a3970 100644
--- a/pkg/services/auth/auth_token_test.go
+++ b/pkg/services/auth/auth_token_test.go
@@ -73,7 +73,7 @@ func TestUserAuthToken(t *testing.T) {
 
 			Convey("signing out an none existing session should return an error", func() {
 				httpreq := &http.Request{Header: make(http.Header)}
-				httpreq.AddCookie(&http.Cookie{Name: userAuthTokenService.Cfg.LoginCookieName, Value: "missing-session-cookie"})
+				httpreq.AddCookie(&http.Cookie{Name: userAuthTokenService.Cfg.LoginCookieName, Value: ""})
 
 				ctx := &models.ReqContext{Context: &macaron.Context{
 					Req:  macaron.Request{Request: httpreq},