diff --git a/bundles/org.eclipse.e4.core.di.extensions/src/org/eclipse/e4/core/di/internal/extensions/PreferencesObjectSupplier.java b/bundles/org.eclipse.e4.core.di.extensions/src/org/eclipse/e4/core/di/internal/extensions/PreferencesObjectSupplier.java
index 6cf2cdc..246f1c4 100644
--- a/bundles/org.eclipse.e4.core.di.extensions/src/org/eclipse/e4/core/di/internal/extensions/PreferencesObjectSupplier.java
+++ b/bundles/org.eclipse.e4.core.di.extensions/src/org/eclipse/e4/core/di/internal/extensions/PreferencesObjectSupplier.java
@@ -124,8 +124,6 @@
 			return getPreferencesService().getString(nodePath, key, null, null);
 		else if (Boolean.class.equals(descriptorsClass))
 			return getPreferencesService().getBoolean(nodePath, key, false, null);
-		else if (Boolean.class.equals(descriptorsClass))
-			return getPreferencesService().getBoolean(nodePath, key, false, null);
 		else if (Integer.class.equals(descriptorsClass))
 			return getPreferencesService().getInt(nodePath, key, 0, null);
 		else if (Double.class.equals(descriptorsClass))
