diff --git a/pkg/api/datasources.go b/pkg/api/datasources.go
index 621e8c29943..93f08f2287d 100644
--- a/pkg/api/datasources.go
+++ b/pkg/api/datasources.go
@@ -241,7 +241,7 @@ func UpdateDataSource(c *models.ReqContext, cmd models.UpdateDataSourceCommand)
 	err = bus.Dispatch(&cmd)
 	if err != nil {
 		if errors.Is(err, models.ErrDataSourceUpdatingOldVersion) {
-			return response.Error(500, "Failed to update datasource. Reload new version and try again", err)
+			return response.Error(409, "Datasource has already been updated by someone else. Please reload and try again", err)
 		}
 		return response.Error(500, "Failed to update datasource", err)
 	}