diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index ff7b751d7..439be2a12 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -1,9 +1,6 @@
 dj-database-url==0.4.1
 django-haystack==2.6.0
 django>=1.10,<1.11
-# TODO O django-admin-bootstrapped 2.5.7 não inseriu a mudança que permite
-# a compatibilidade com Django 1.9+. A linha abaixo será mudada quando uma
-# nova versão do django-admin-bootstrapped for lançada
 git+git://github.com/rubgombar1/django-admin-bootstrapped.git
 django-bootstrap3==7.0.1
 django-bower==5.2.0
diff --git a/sapl/settings.py b/sapl/settings.py
index 2fa161e04..38d241005 100644
--- a/sapl/settings.py
+++ b/sapl/settings.py
@@ -112,10 +112,6 @@ HAYSTACK_CONNECTIONS = {
     },
 }
 
-
-if DEBUG:
-    INSTALLED_APPS += ('debug_toolbar', 'rest_framework_docs',)
-
 MIDDLEWARE = [
     'reversion.middleware.RevisionMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
@@ -127,9 +123,11 @@ MIDDLEWARE = [
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
     'django.middleware.security.SecurityMiddleware',
-    'debug_toolbar.middleware.DebugToolbarMiddleware',
     'speedinfo.middleware.ProfilerMiddleware',
 ]
+if DEBUG:
+    INSTALLED_APPS += ('debug_toolbar', 'rest_framework_docs',)
+    MIDDLEWARE += ['debug_toolbar.middleware.DebugToolbarMiddleware', ]
 
 CACHES = {
     'default': {