diff --git a/viewer/viewer-awt/src/main/java/org/icepdf/ri/common/SwingController.java b/viewer/viewer-awt/src/main/java/org/icepdf/ri/common/SwingController.java
index 5dccbec22..f41c569d1 100644
--- a/viewer/viewer-awt/src/main/java/org/icepdf/ri/common/SwingController.java
+++ b/viewer/viewer-awt/src/main/java/org/icepdf/ri/common/SwingController.java
@@ -5910,22 +5910,8 @@ private void callOnFilteredAnnotations(final AnnotationFilter filter, final Cons
     }
 
     private static EmptyPagesFilter getEmptyPagesFilter() {
-        final String minRatioStr = System.getProperty("icepdf.filter.pages.empty.ratio", "0.001");
-        double minRatio;
-        try {
-            minRatio = Double.parseDouble(minRatioStr);
-        } catch (final NumberFormatException e) {
-            logger.warning("Not a valid double value : " + minRatioStr);
-            minRatio = 0.001;
-        }
-        final String whiteFloorStr = System.getProperty("icepdf.filter.pages.empty.white.floor", "240");
-        int whiteFloor;
-        try {
-            whiteFloor = Integer.parseInt(whiteFloorStr);
-        } catch (final NumberFormatException e) {
-            logger.warning("Not a valid int value : " + whiteFloorStr);
-            whiteFloor = 240;
-        }
+        final double minRatio = Defs.doubleProperty("org.icepdf.ri.viewer.filters.empty.pages.ratio", 0.005);
+        final int whiteFloor = Defs.intProperty("org.icepdf.ri.viewer.filters.empty.white.floor", 240);
         return new EmptyPagesFilter(minRatio, whiteFloor);
     }
 }
\ No newline at end of file