diff --git a/templates/components/datatables.macro.html.twig b/templates/components/datatables.macro.html.twig
index 33f92467..0a35d522 100644
--- a/templates/components/datatables.macro.html.twig
+++ b/templates/components/datatables.macro.html.twig
@@ -1,5 +1,5 @@
 {% macro datatable(datatable, controller = 'elements/datatables/datatables', state_save_tag = null) %}
-    <div {{ stimulus_controller(controller, {"stateSaveTag": state_save_tag}) }} data-dt-settings='{{ datatable_settings(datatable)|escape('html_attr') }}' data-dt-url="{{ app.request.requestUri }}">
+    <div {{ stimulus_controller(controller, {"stateSaveTag": state_save_tag}) }} data-dt-settings='{{ datatable_settings(datatable)|escape('html_attr') }}' data-dt-url="{{ app.request.baseUrl ~ app.request.requestUri }}">
         <div {{ stimulus_target(controller, 'dt') }}>
             <div class="card-body">
                 <div class="card">
@@ -25,7 +25,7 @@
           data-delete-message="{% trans %}part_list.action.delete-message{% endtrans %}">
         <input type="hidden" name="_token" value="{{ csrf_token('table_action') }}">
 
-        <input type="hidden" name="redirect_back" value="{{ app.request.requestUri }}">
+        <input type="hidden" name="redirect_back" value="{{  app.request.baseUrl ~ app.request.requestUri }}">
 
         <input type="hidden" name="ids" {{ stimulus_target('elements/datatables/parts', 'selectIDs') }} value="">