diff --git a/library/src/main/java/com/rubengees/introduction/IntroductionActivity.java b/library/src/main/java/com/rubengees/introduction/IntroductionActivity.java
index af8e344..d87f77a 100644
--- a/library/src/main/java/com/rubengees/introduction/IntroductionActivity.java
+++ b/library/src/main/java/com/rubengees/introduction/IntroductionActivity.java
@@ -223,11 +223,11 @@ private void initManagers() {
                 skipText != null, slides.size());
         indicatorManager = configuration.getIndicatorManager();
 
-        if (indicatorManager == null) {
-            if (showIndicator) {
-                indicatorManager = new DotIndicatorManager();
-            }
-        } else {
+        if (indicatorManager == null && showIndicator) {
+            indicatorManager = new DotIndicatorManager();
+        }
+
+        if (indicatorManager != null) {
             indicatorContainer.addView(indicatorManager.init(LayoutInflater.from(this),
                     indicatorContainer, slides.size()));
         }
diff --git a/library/src/main/java/com/rubengees/introduction/IntroductionConfiguration.java b/library/src/main/java/com/rubengees/introduction/IntroductionConfiguration.java
index ca277ba..e845b22 100644
--- a/library/src/main/java/com/rubengees/introduction/IntroductionConfiguration.java
+++ b/library/src/main/java/com/rubengees/introduction/IntroductionConfiguration.java
@@ -32,7 +32,7 @@
  * @author Ruben Gees
  */
 public final class IntroductionConfiguration {
-    private static IntroductionConfiguration INSTANCE = new IntroductionConfiguration();
+    private static IntroductionConfiguration INSTANCE;
 
     private OnSlideListener onSlideListener;
     private ViewPager.PageTransformer pageTransformer;