diff --git a/app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperFragment.java b/app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperFragment.java
index b1a8c708a8..eb4812c6bf 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperFragment.java
@@ -85,7 +85,7 @@ public class ChatWallpaperFragment extends Fragment {
                     R.string.ChatWallpaperFragment__clear,
                     () -> {
                       viewModel.setWallpaper(null);
-                      viewModel.setDimInDarkTheme(false);
+                      viewModel.setDimInDarkTheme(true);
                       viewModel.saveWallpaperSelection();
                     });
     });
@@ -95,7 +95,7 @@ public class ChatWallpaperFragment extends Fragment {
                     R.string.ChatWallpaperFragment__reset,
                     () -> {
                       viewModel.setWallpaper(null);
-                      viewModel.setDimInDarkTheme(false);
+                      viewModel.setDimInDarkTheme(true);
                       viewModel.resetAllWallpaper();
                     });
     });
diff --git a/app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperViewModel.java
index b756bf3840..b67651bbfb 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperViewModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperViewModel.java
@@ -32,7 +32,7 @@ public class ChatWallpaperViewModel extends ViewModel {
     this.recipientId = recipientId;
 
     ChatWallpaper currentWallpaper = repository.getCurrentWallpaper(recipientId);
-    dimInDarkTheme.setValue(currentWallpaper != null && currentWallpaper.getDimLevelForDarkTheme() > 0f);
+    dimInDarkTheme.setValue(currentWallpaper == null || currentWallpaper.getDimLevelForDarkTheme() > 0f);
     enableWallpaperControls.setValue(hasClearableWallpaper());
     wallpaper.setValue(Optional.fromNullable(currentWallpaper));
   }
@@ -65,7 +65,7 @@ public class ChatWallpaperViewModel extends ViewModel {
         ChatWallpaper globalWallpaper = SignalStore.wallpaper().getWallpaper();
 
         this.wallpaper.setValue(Optional.fromNullable(globalWallpaper));
-        this.dimInDarkTheme.setValue(globalWallpaper != null && globalWallpaper.getDimLevelForDarkTheme() > 0);
+        this.dimInDarkTheme.setValue(globalWallpaper == null || globalWallpaper.getDimLevelForDarkTheme() > 0);
       }
 
       enableWallpaperControls.setValue(false);