diff --git a/tasks.py b/tasks.py
index d10295f5c47b9dd2196391f3b8a3919bf9b49c08..02cd57fb5edbee3b639c71302c8fbef7c29e6386 100644
--- a/tasks.py
+++ b/tasks.py
@@ -182,7 +182,7 @@ def parse_protocol_async_inner(protocol):
     db.session.commit()
     if protocol.source is None or len(protocol.source.strip()) == 0:
         return _make_error(protocol, "Parsing", "Protocol source is empty", "")
-    if protocol.source == config.EMPTY_ETHERPAD:
+    if config.ETHERPAD_ACTIVE and protocol.source == config.EMPTY_ETHERPAD:
         return _make_error(
             protocol, "Parsing", "The etherpad is unmodified and does not "
             "contain a protocol.", protocol.source)
diff --git a/views/forms.py b/views/forms.py
index 3b7e64ec73a36ccaa01dc00fcd9d5332e757ca5e..77308a73c0dd27907139adcd074db434cc7bc1eb 100644
--- a/views/forms.py
+++ b/views/forms.py
@@ -61,7 +61,7 @@ def get_calendar_choices(protocoltype=None):
 
 def get_printer_choices():
     choices = []
-    if config.PRINTING_PRINTERS is not None:
+    if config.PRINTING_ACTIVE and config.PRINTING_PRINTERS is not None:
         choices = list(zip(config.PRINTING_PRINTERS, config.PRINTING_PRINTERS))
     choices.insert(0, ("", "Nicht drucken"))
     return choices