diff --git a/scm-core/src/main/java/sonia/scm/plugin/InstalledPluginDescriptor.java b/scm-core/src/main/java/sonia/scm/plugin/InstalledPluginDescriptor.java
index 097a06ab2c..2c3290234e 100644
--- a/scm-core/src/main/java/sonia/scm/plugin/InstalledPluginDescriptor.java
+++ b/scm-core/src/main/java/sonia/scm/plugin/InstalledPluginDescriptor.java
@@ -58,6 +58,8 @@ import java.util.Set;
 public final class InstalledPluginDescriptor extends ScmModule implements PluginDescriptor
 {
 
+  private static final PluginCondition EMPTY_CONDITION = new PluginCondition();
+
   /**
    * Constructs ...
    *
@@ -168,7 +170,7 @@ public final class InstalledPluginDescriptor extends ScmModule implements Plugin
   @Override
   public PluginCondition getCondition()
   {
-    return condition;
+    return MoreObjects.firstNonNull(condition, EMPTY_CONDITION);
   }
 
   /**
diff --git a/scm-core/src/test/java/sonia/scm/plugin/PluginConditionTest.java b/scm-core/src/test/java/sonia/scm/plugin/PluginConditionTest.java
index cc48001704..b5133f6dbe 100644
--- a/scm-core/src/test/java/sonia/scm/plugin/PluginConditionTest.java
+++ b/scm-core/src/test/java/sonia/scm/plugin/PluginConditionTest.java
@@ -50,6 +50,11 @@ import java.util.Arrays;
 public class PluginConditionTest
 {
 
+  @Test
+  public void testEmptyShouldBeSupported() {
+    assertTrue(new PluginCondition().isSupported());
+  }
+
   /**
    * Method description
    *