diff --git a/b2share/modules/communities/cli.py b/b2share/modules/communities/cli.py
index c2d5384dcb..31f9c89c82 100644
--- a/b2share/modules/communities/cli.py
+++ b/b2share/modules/communities/cli.py
@@ -29,7 +29,7 @@
 from os.path import isfile
 
 import click
-from flask_cli import with_appcontext
+from flask.cli import with_appcontext
 
 from invenio_db import db
 
diff --git a/b2share/modules/files/cli.py b/b2share/modules/files/cli.py
index eb6c5d0cd4..867b87c726 100644
--- a/b2share/modules/files/cli.py
+++ b/b2share/modules/files/cli.py
@@ -31,7 +31,7 @@
 
 from sqlalchemy import exists, or_
 import click
-from flask_cli import with_appcontext
+from flask.cli import with_appcontext
 from invenio_db import db
 from invenio_files_rest.models import Location
 
diff --git a/b2share/modules/oaiserver/cli.py b/b2share/modules/oaiserver/cli.py
index 653d8fd2b8..bea0ee9f75 100644
--- a/b2share/modules/oaiserver/cli.py
+++ b/b2share/modules/oaiserver/cli.py
@@ -27,7 +27,7 @@
 from __future__ import absolute_import, print_function
 
 import click
-from flask_cli import with_appcontext
+from flask.cli import with_appcontext
 from sqlalchemy.orm.attributes import flag_modified
 
 from invenio_db import db
diff --git a/b2share/modules/records/cli.py b/b2share/modules/records/cli.py
index 9001787fce..ed92363885 100644
--- a/b2share/modules/records/cli.py
+++ b/b2share/modules/records/cli.py
@@ -27,7 +27,7 @@
 from __future__ import absolute_import, print_function
 
 import click
-from flask_cli import with_appcontext
+from flask.cli import with_appcontext
 import requests
 
 from invenio_db import db
diff --git a/b2share/modules/schemas/cli.py b/b2share/modules/schemas/cli.py
index dc37e8df60..b7daee9632 100644
--- a/b2share/modules/schemas/cli.py
+++ b/b2share/modules/schemas/cli.py
@@ -30,7 +30,7 @@
 import os
 from uuid import UUID
 import click
-from flask_cli import with_appcontext
+from flask.cli import with_appcontext
 
 from flask import current_app
 from invenio_db import db
diff --git a/demo/b2share_demo/cli.py b/demo/b2share_demo/cli.py
index c293c46537..b07aa1a7af 100644
--- a/demo/b2share_demo/cli.py
+++ b/demo/b2share_demo/cli.py
@@ -30,7 +30,7 @@
 import pathlib
 
 import click
-from flask_cli import with_appcontext
+from flask.cli import with_appcontext
 from flask import current_app
 from invenio_db import db
 from invenio_files_rest.models import Location
diff --git a/demo/b2share_demo/migration_cli.py b/demo/b2share_demo/migration_cli.py
index 7434d652b8..a9ef1c5b47 100644
--- a/demo/b2share_demo/migration_cli.py
+++ b/demo/b2share_demo/migration_cli.py
@@ -34,7 +34,7 @@
 from urllib.parse import urlunsplit, urljoin, urlsplit
 
 import click
-from flask_cli import with_appcontext
+from flask.cli import with_appcontext
 from flask import current_app
 from invenio_db import db
 from invenio_indexer.api import RecordIndexer
diff --git a/tests/b2share_functional_tests/cli_tests/test_communities_cli.py b/tests/b2share_functional_tests/cli_tests/test_communities_cli.py
index f2b7693076..ad74093fe7 100644
--- a/tests/b2share_functional_tests/cli_tests/test_communities_cli.py
+++ b/tests/b2share_functional_tests/cli_tests/test_communities_cli.py
@@ -24,7 +24,7 @@
 import json
 import pytest
 from click.testing import CliRunner
-from flask_cli import ScriptInfo
+from flask.cli import ScriptInfo
 
 from b2share.modules.communities.cli import communities as communities_cmd
 from b2share.modules.communities.helpers import get_community_by_name_or_id
diff --git a/tests/b2share_functional_tests/cli_tests/test_schema_cli.py b/tests/b2share_functional_tests/cli_tests/test_schema_cli.py
index 7958f3692f..f0ec6cb788 100644
--- a/tests/b2share_functional_tests/cli_tests/test_schema_cli.py
+++ b/tests/b2share_functional_tests/cli_tests/test_schema_cli.py
@@ -24,7 +24,7 @@
 import json
 import pytest
 from click.testing import CliRunner
-from flask_cli import ScriptInfo
+from flask.cli import ScriptInfo
 from flask import url_for
 
 from invenio_db import db
diff --git a/tests/b2share_functional_tests/test_record_cli.py b/tests/b2share_functional_tests/test_record_cli.py
index 7e99a5c48d..15866dc92d 100644
--- a/tests/b2share_functional_tests/test_record_cli.py
+++ b/tests/b2share_functional_tests/test_record_cli.py
@@ -22,7 +22,7 @@
 
 from unittest.mock import patch, DEFAULT
 from click.testing import CliRunner
-from flask_cli import ScriptInfo
+from flask.cli import ScriptInfo
 
 import b2share.modules.records.cli as records_cli
 
diff --git a/tests/b2share_unit_tests/records/test_records_tasks.py b/tests/b2share_unit_tests/records/test_records_tasks.py
index 649555bc25..b9a4a3fbef 100644
--- a/tests/b2share_unit_tests/records/test_records_tasks.py
+++ b/tests/b2share_unit_tests/records/test_records_tasks.py
@@ -38,7 +38,7 @@
 from invenio_records_files.api import Record
 from click.testing import CliRunner
 from b2share.modules.records.cli import b2records
-from flask_cli import ScriptInfo
+from flask.cli import ScriptInfo
 
 
 @pytest.mark.parametrize('cli_cmd', [True, False])
diff --git a/tests/conftest.py b/tests/conftest.py
index 6be2956078..54a2ee3117 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -35,7 +35,7 @@
 from copy import deepcopy
 from collections import namedtuple
 
-from flask_cli import ScriptInfo
+from flask.cli import ScriptInfo
 import pytest
 import responses
 from jsonpatch import apply_patch
diff --git a/tests/demo/test_demo.py b/tests/demo/test_demo.py
index e175d686a6..a521fd3982 100644
--- a/tests/demo/test_demo.py
+++ b/tests/demo/test_demo.py
@@ -27,7 +27,7 @@
 
 import pytest
 from click.testing import CliRunner
-from flask_cli import ScriptInfo
+from flask.cli import ScriptInfo
 from invenio_pidstore.resolver import Resolver
 from invenio_records import Record