diff --git a/SignalServiceKit/src/Util/AppVersion.h b/SignalServiceKit/src/Util/AppVersion.h
index 821003a3e1..bc8ec7f11e 100644
--- a/SignalServiceKit/src/Util/AppVersion.h
+++ b/SignalServiceKit/src/Util/AppVersion.h
@@ -8,7 +8,6 @@ NS_ASSUME_NONNULL_BEGIN
 @interface AppVersion : NSObject
 
 // These properties are global and available immediately
-@property (class, atomic, readonly) NSString *hardwareInfoString;
 @property (class, atomic, readonly) NSString *iOSVersionString;
 
 // The properties are updated immediately after launch.
diff --git a/SignalServiceKit/src/Util/AppVersion.m b/SignalServiceKit/src/Util/AppVersion.m
index 4e59770b3a..672d4b5d04 100644
--- a/SignalServiceKit/src/Util/AppVersion.m
+++ b/SignalServiceKit/src/Util/AppVersion.m
@@ -46,14 +46,6 @@ NSString *const kNSUserDefaults_LastCompletedLaunchAppVersion_NSE
     return instance;
 }
 
-+ (NSString *)hardwareInfoString
-{
-    NSString *marketingString = UIDevice.currentDevice.model;
-    NSString *machineString = [NSString stringFromSysctlKey:@"hw.machine"];
-    NSString *modelString = [NSString stringFromSysctlKey:@"hw.model"];
-    return [NSString stringWithFormat:@"%@ (%@; %@)", marketingString, machineString, modelString];
-}
-
 + (NSString *)iOSVersionString
 {
     NSString *majorMinor = UIDevice.currentDevice.systemVersion;
diff --git a/SignalServiceKit/src/Util/AppVersion.swift b/SignalServiceKit/src/Util/AppVersion.swift
index af08b58d55..ee30cf498a 100644
--- a/SignalServiceKit/src/Util/AppVersion.swift
+++ b/SignalServiceKit/src/Util/AppVersion.swift
@@ -6,6 +6,17 @@
 import Foundation
 
 extension AppVersion {
+    // MARK: - Properties
+
+    public static var hardwareInfoString: String {
+        let marketingString = UIDevice.current.model
+        let machineString = String(sysctlKey: "hw.machine") ?? "nil"
+        let modelString = String(sysctlKey: "hw.model") ?? "nil"
+        return "\(marketingString) (\(machineString); \(modelString))"
+    }
+
+    // MARK: - Startup logging
+
     @objc
     func startupLogging() {
         Logger.info("firstAppVersion: \(firstAppVersion)")