diff --git a/data/converter/src/main/java/app/myzel394/numberhub/data/converter/UnitsRepositoryImpl.kt b/data/converter/src/main/java/app/myzel394/numberhub/data/converter/UnitsRepositoryImpl.kt
index 8b897f9d..4931cb0a 100644
--- a/data/converter/src/main/java/app/myzel394/numberhub/data/converter/UnitsRepositoryImpl.kt
+++ b/data/converter/src/main/java/app/myzel394/numberhub/data/converter/UnitsRepositoryImpl.kt
@@ -342,7 +342,9 @@ class UnitsRepositoryImpl @Inject constructor(
             val conversion = unitFrom.convert(unitTo, value)
 
             ConverterResult.NumberBase(conversion)
-        } catch (e: Exception) {
+        } catch (error: Exception) {
+            Log.e("UnitsRepositoryImpl", "Failed to convert number base $unitFromId -> $unitToId: $error")
+            error.printStackTrace()
             ConverterResult.Error.ConversionError
         }
     }
diff --git a/feature/converter/src/main/java/app/myzel394/numberhub/feature/converter/ConverterViewModel.kt b/feature/converter/src/main/java/app/myzel394/numberhub/feature/converter/ConverterViewModel.kt
index c8657388..1da86f37 100644
--- a/feature/converter/src/main/java/app/myzel394/numberhub/feature/converter/ConverterViewModel.kt
+++ b/feature/converter/src/main/java/app/myzel394/numberhub/feature/converter/ConverterViewModel.kt
@@ -23,6 +23,7 @@ import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import app.myzel394.numberhub.core.base.OutputFormat
+import app.myzel394.numberhub.core.base.Token
 import app.myzel394.numberhub.core.ui.common.textfield.getTextField
 import app.myzel394.numberhub.data.common.combine
 import app.myzel394.numberhub.data.common.stateIn
@@ -175,11 +176,13 @@ internal class ConverterViewModel @Inject constructor(
     fun convertNumberBase() {
         conversionJob?.cancel()
         conversionJob = viewModelScope.launch {
-            unitsRepo.convertNumberBase(
+            val result = unitsRepo.convertNumberBase(
                 unitFromId = unitFromId.value ?: return@launch,
                 unitToId = unitToId.value ?: return@launch,
-                value = input1.value.text,
+                value = input1.value.text.ifEmpty { Token.Digit._0 }
             )
+
+            output.update { result }
         }
     }
 
diff --git a/feature/settings/src/main/java/app/myzel394/numberhub/feature/settings/SettingsScreen.kt b/feature/settings/src/main/java/app/myzel394/numberhub/feature/settings/SettingsScreen.kt
index 81710470..d1967982 100644
--- a/feature/settings/src/main/java/app/myzel394/numberhub/feature/settings/SettingsScreen.kt
+++ b/feature/settings/src/main/java/app/myzel394/numberhub/feature/settings/SettingsScreen.kt
@@ -248,7 +248,8 @@ private fun SettingsScreen(
             }
 
             AnimatedVisibility(
-                visible = uiState.showUpdateChangelog,
+                // TODO: Restore this line for next update
+                visible = false,
                 enter = expandVertically() + fadeIn(),
                 exit = shrinkVertically() + fadeOut(),
             ) {