diff --git a/docker/settings.py b/docker/settings.py
index 3d169f0..840c9fc 100644
--- a/docker/settings.py
+++ b/docker/settings.py
@@ -100,7 +100,7 @@ MIDDLEWARE_CLASSES = (
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
-    'reversion.middleware.RevisionMiddleware',
+    'layerindex.middleware.NonAtomicRevisionMiddleware',
 )
 
 # We allow CORS calls from everybody
diff --git a/layerindex/middleware.py b/layerindex/middleware.py
new file mode 100644
index 0000000..cea207e
--- /dev/null
+++ b/layerindex/middleware.py
@@ -0,0 +1,15 @@
+# layerindex-web - middleware definitions
+#
+# Copyright (C) 2019 Intel Corporation
+#
+# Licensed under the MIT license, see COPYING.MIT for details
+
+from django.utils.deprecation import MiddlewareMixin
+from django.http import HttpResponseRedirect
+from django.core.urlresolvers import reverse
+from reversion.middleware import RevisionMiddleware
+import settings
+import re
+
+class NonAtomicRevisionMiddleware(RevisionMiddleware):
+    atomic = False
diff --git a/settings.py b/settings.py
index 755759b..3dc4b99 100644
--- a/settings.py
+++ b/settings.py
@@ -100,7 +100,7 @@ MIDDLEWARE_CLASSES = (
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
-    'reversion.middleware.RevisionMiddleware',
+    'layerindex.middleware.NonAtomicRevisionMiddleware',
 )
 
 # We allow CORS calls from everybody