diff --git a/OpenHABCore/Sources/OpenHABCore/Model/OpenHABWidget.swift b/OpenHABCore/Sources/OpenHABCore/Model/OpenHABWidget.swift
index 472a7ded..283d1c69 100644
--- a/OpenHABCore/Sources/OpenHABCore/Model/OpenHABWidget.swift
+++ b/OpenHABCore/Sources/OpenHABCore/Model/OpenHABWidget.swift
@@ -217,7 +217,7 @@ public class OpenHABWidget: NSObject, MKAnnotation, Identifiable {
 
 extension OpenHABWidget {
     // This is an ugly initializer
-    convenience init(widgetId: String, label: String, icon: String, type: WidgetType, url: String?, period: String?, minValue: Double?, maxValue: Double?, step: Double?, refresh: Int?, height: Double?, isLeaf: Bool?, iconColor: String?, labelColor: String?, valueColor: String?, service: String?, state: String?, text: String?, legend: Bool?, inputHint: InputHint, encoding: String?, item: OpenHABItem?, linkedPage: OpenHABSitemapPage?, mappings: [OpenHABWidgetMapping], widgets: [OpenHABWidget], visibility: Bool?, switchSupport: Bool?, forceAsItem: Bool?) {
+    convenience init(widgetId: String, label: String, icon: String, type: WidgetType, url: String?, period: String?, minValue: Double?, maxValue: Double?, step: Double?, refresh: Int?, height: Double?, isLeaf: Bool?, iconColor: String?, labelColor: String?, valueColor: String?, service: String?, state: String?, text: String?, legend: Bool?, inputHint: InputHint?, encoding: String?, item: OpenHABItem?, linkedPage: OpenHABSitemapPage?, mappings: [OpenHABWidgetMapping], widgets: [OpenHABWidget], visibility: Bool?, switchSupport: Bool?, forceAsItem: Bool?) {
         self.init()
         id = widgetId
         self.widgetId = widgetId
@@ -244,7 +244,7 @@ extension OpenHABWidget {
         self.state = state ?? ""
         self.text = text ?? ""
         self.legend = legend
-        self.inputHint = inputHint
+        self.inputHint = inputHint ?? .text
         self.encoding = encoding ?? ""
         self.item = item
         self.linkedPage = linkedPage
@@ -323,7 +323,7 @@ public extension OpenHABWidget {
         let state: String?
         let text: String?
         let legend: Bool?
-        let inputHint: InputHint
+        let inputHint: InputHint?
         let encoding: String?
         let groupType: String?
         let item: OpenHABItem.CodingData?
diff --git a/openHABWatch Extension/openHABWatch Extension/Model/ObservableOpenHABWidget.swift b/openHABWatch Extension/openHABWatch Extension/Model/ObservableOpenHABWidget.swift
index bd869c3e..82fcd7df 100644
--- a/openHABWatch Extension/openHABWatch Extension/Model/ObservableOpenHABWidget.swift	
+++ b/openHABWatch Extension/openHABWatch Extension/Model/ObservableOpenHABWidget.swift	
@@ -221,7 +221,7 @@ class ObservableOpenHABWidget: NSObject, MKAnnotation, Identifiable, ObservableO
 
 extension ObservableOpenHABWidget {
     // This is an ugly initializer
-    convenience init(widgetId: String, label: String, icon: String, type: String, url: String?, period: String?, minValue: Double?, maxValue: Double?, step: Double?, refresh: Int?, height: Double?, isLeaf: Bool?, iconColor: String?, labelColor: String?, valueColor: String?, service: String?, state: String?, text: String?, legend: Bool?, inputHint: InputHint, encoding: String?, item: OpenHABItem?, linkedPage: OpenHABSitemapPage?, mappings: [OpenHABWidgetMapping], widgets: [ObservableOpenHABWidget], forceAsItem: Bool?) {
+    convenience init(widgetId: String, label: String, icon: String, type: String, url: String?, period: String?, minValue: Double?, maxValue: Double?, step: Double?, refresh: Int?, height: Double?, isLeaf: Bool?, iconColor: String?, labelColor: String?, valueColor: String?, service: String?, state: String?, text: String?, legend: Bool?, inputHint: InputHint?, encoding: String?, item: OpenHABItem?, linkedPage: OpenHABSitemapPage?, mappings: [OpenHABWidgetMapping], widgets: [ObservableOpenHABWidget], forceAsItem: Bool?) {
         self.init()
 
         id = widgetId
@@ -250,7 +250,7 @@ extension ObservableOpenHABWidget {
         self.state = state ?? ""
         self.text = text ?? ""
         self.legend = legend
-        self.inputHint = inputHint
+        self.inputHint = inputHint ?? .text
         self.encoding = encoding ?? ""
         self.item = item
         self.linkedPage = linkedPage
@@ -332,7 +332,7 @@ extension ObservableOpenHABWidget {
         let state: String?
         let text: String?
         let legend: Bool?
-        let inputHint: InputHint
+        let inputHint: InputHint?
         let encoding: String?
         let groupType: String?
         let item: OpenHABItem.CodingData?